[LIT] Add support for %basename_s to get base name of source file

[jurahul]

Add support for %basename_s pattern in the RUN commands to get the base name of the source file, and adopt it in a TableGen LIT test.

[llvmbot]

@llvm/pr-subscribers-testing-tools

Author: Rahul Joshi (jurahul)

Changes

Add support for %basename_s pattern in the RUN commands to get the base name of the source file, and adopt it in a TableGen LIT test.

---

Full diff: https://github.com/llvm/llvm-project/pull/110993.diff

3 Files Affected:

• (modified) llvm/docs/CommandGuide/lit.rst (+1)
• (modified) llvm/test/TableGen/anonymous-location.td (+1-1)
• (modified) llvm/utils/lit/lit/TestRunner.py (+4-2)

diff --git a/llvm/docs/CommandGuide/lit.rst b/llvm/docs/CommandGuide/lit.rst
index c9d5baba3e2f49..9216eb223d1491 100644
--- a/llvm/docs/CommandGuide/lit.rst
+++ b/llvm/docs/CommandGuide/lit.rst
@@ -535,6 +535,7 @@ TestRunner.py:
  %{fs-tmp-root}          root component of file system paths pointing to the test's temporary directory
  %{fs-sep}               file system path separator
  %t                      temporary file name unique to the test
+ %basename_s             The last path component of %s
  %basename_t             The last path component of %t but without the ``.tmp`` extension
  %T                      parent directory of %t (not unique, deprecated, do not use)
  %%                      %
diff --git a/llvm/test/TableGen/anonymous-location.td b/llvm/test/TableGen/anonymous-location.td
index ffeba6ebcb686f..5485d2027b9fd0 100644
--- a/llvm/test/TableGen/anonymous-location.td
+++ b/llvm/test/TableGen/anonymous-location.td
@@ -1,4 +1,4 @@
-// RUN: llvm-tblgen --print-detailed-records %s | FileCheck %s -DFILE=anonymous-location.td
+// RUN: llvm-tblgen --print-detailed-records %s | FileCheck %s -DFILE=%basename_s
 
 class A<int a> {
   int Num = a;
diff --git a/llvm/utils/lit/lit/TestRunner.py b/llvm/utils/lit/lit/TestRunner.py
index a1785073547ad0..080a618572645d 100644
--- a/llvm/utils/lit/lit/TestRunner.py
+++ b/llvm/utils/lit/lit/TestRunner.py
@@ -1394,10 +1394,12 @@ def getDefaultSubstitutions(test, tmpDir, tmpBase, normalize_slashes=False):
     substitutions = []
     substitutions.extend(test.config.substitutions)
     tmpName = tmpBase + ".tmp"
-    baseName = os.path.basename(tmpBase)
+    tmpBaseName = os.path.basename(tmpBase)
+    sourceBaseName = os.path.basename(sourcepath)
 
     substitutions.append(("%{pathsep}", os.pathsep))
-    substitutions.append(("%basename_t", baseName))
+    substitutions.append(("%basename_t", tmpBaseName))
+    substitutions.append(("%basename_s", sourceBaseName))
 
     substitutions.extend(
         [

[ilovepi]

This seems mostly fine, but we should probably have a test under llvm/utils/lit/tests (https://github.com/llvm/llvm-project/tree/main/llvm/utils/lit/tests), rather than just using it in a single tablegen test. Would you mind moving the test there?

[jurahul]

This seems mostly fine, but we should probably have a test under llvm/utils/lit/tests (https://github.com/llvm/llvm-project/tree/main/llvm/utils/lit/tests), rather than just using it in a single tablegen test. Would you mind moving the test there?

Thanks. I'll add a new test instead of moving the TableGen test.

[jurahul]

I added a separate unit test under lit.

[ilovepi]

LGTM, modulo one small comment and premerge checks are passing.

[arichardson]

I see this is consistent with the already existing basename_t, but I feel that it would make a lot more sense if this was consistent with %{s:real} and %{/s:regex_replacement} as below, i.e. %{s:basename}.

[jurahul]

Let me look into changing this. I agree this makes sense.

[jurahul]

I created: #111062, will start review once checks pass.