[compiler-rt] [test] [profile] Add an .exe suffix to some temp executables

[mstorsjo]

Summary

Mingw toolchains implicitly add an .exe suffix if the output linked
file doesn't have a suffix. In many cases the extra suffix doesn't
cause any issues, but in some tests, this discrepancy between expected
output file name and actual output file does cause issues.

In one test, a later rm command fails to remove the executable since it
doesn't have the expected name. (Alternatively the rm command could use
a wildcard.)

In another test, the executables that are run with a ./ prefix doesn't
manage to resolve the executable when it has an extra implicit .exe
suffix.

[mstorsjo]

Ping

[alvinhochun]

compiler-rt/test/profile/instrprof-basic.c

45

Do you know is there any reason why this test case needs to remove the exe but the previous test cases don't? Can we instead just remove this rm command?

[mstorsjo]

compiler-rt/test/profile/instrprof-basic.c

45

In this test, the profile data files are written in the same directory as the executable, and llvm-profdata reads all files the directory. If the executable is left there, it fails to read that file.

[vitalybuka]

compiler-rt/test/profile/instrprof-basic.c

45

can you keep everything as is and just do

rm -f %t.dir4/merge4*

compiler-rt/test/profile/instrprof-tmpdir.c

7

why do you need exe here?
isn't windows will implicitly add .exe when you run ./binary ?

[mstorsjo]

compiler-rt/test/profile/instrprof-basic.c

45

Yeah, that should work too

compiler-rt/test/profile/instrprof-tmpdir.c

7

Yes, e.g. cmd.exe does that, but here, we have Python executing the commands.

In most cases, the executable has got some suffix (e.g. %t expanding to something with .tmp as suffix); in those cases there’s no extra suffix added - but for a plain name like binary here, we’ve got this mismatch.

[mstorsjo]

compiler-rt/test/profile/instrprof-tmpdir.c

7

Actually, the difference is even more subtle… In most tests, we execute e.g. %t/binary, but here we try to execute ./binary. The Python executor seems to handle adding an implicit extra .exe if needed for finding the executable with an absolute path from %t, but not with ./.

[mstorsjo]

compiler-rt/test/profile/instrprof-tmpdir.c

7

So I guess writing %run %t/binary here would work too (it doesn’t seem to remove anything of what this test tries to test); would you prefer that? That would be more alike most often tests.

[vitalybuka]

compiler-rt/test/profile/instrprof-tmpdir.c

7

Yes, I would prefer to avoid .exe on platforms where it's not needed.
Same applies to merge4

[mstorsjo]

Updated to not add .exe suffixes explicitly, but work around the ambiguity differently.

compiler-rt/test/profile/instrprof-basic.c

 // RUN: rm -fr %t.dir4
 // RUN: mkdir -p %t.dir4
 // RUN: %clang_pgogen -o %t.dir4/merge4 -O0 %s
 // RUN: cd %t.dir4
 // RUN: %run %t.dir4/merge4
 // RUN: %run %t.dir4/merge4
 // RUN: %run %t.dir4/merge4
 // RUN: %run %t.dir4/merge4
-// RUN: rm -f %t.dir4/merge4
+// RUN: rm -f %t.dir4/merge4*
 // RUN: llvm-profdata merge -o %t.m4.profdata ./
 // RUN: %clang_profuse=%t.m4.profdata -O0 -o - -S -emit-llvm %s | FileCheck %s --check-prefix=COMMON  --check-prefix=PGOMERGE
 
 /// Test that the merge pool size can be larger than 10.
 // RUN: rm -fr %t.dir5
 // RUN: mkdir -p %t.dir5
 // RUN: env LLVM_PROFILE_FILE=%t.dir5/e_%20m.profraw %run %t
 // RUN: not ls %t.dir5/e_%20m.profraw
 // RUN: ls %t.dir5/e_*.profraw | count 1
 
 int begin(int i) {
   // COMMON: br i1 %{{.*}}, label %{{.*}}, label %{{.*}}, !prof ![[PD1:[0-9]+]]

compiler-rt/test/profile/instrprof-tmpdir.c

 // RUN: rm -rf %t
 // RUN: mkdir -p %t
 // RUN: cd %t
 // RUN: %clang_profgen -o %t/binary %s
 //
 // Check that a dir separator is appended after %t is subsituted.
-// RUN: env TMPDIR="%t" LLVM_PROFILE_FILE="%%traw1.profraw" %run ./binary
+// RUN: env TMPDIR="%t" LLVM_PROFILE_FILE="%%traw1.profraw" %run %t/binary
 // RUN: llvm-profdata show ./raw1.profraw | FileCheck %s -check-prefix TMPDIR
 //
 // Check that substitution works even if a redundant dir separator is added.
-// RUN: env TMPDIR="%t" LLVM_PROFILE_FILE="%%t/raw2.profraw" %run ./binary
+// RUN: env TMPDIR="%t" LLVM_PROFILE_FILE="%%t/raw2.profraw" %run %t/binary
 // RUN: llvm-profdata show ./raw2.profraw | FileCheck %s -check-prefix TMPDIR
 //
 // Check that we fall back to the default path if TMPDIR is missing.
-// RUN: env -u TMPDIR LLVM_PROFILE_FILE="%%t/raw3.profraw" %run ./binary 2>&1 | FileCheck %s -check-prefix MISSING
+// RUN: env -u TMPDIR LLVM_PROFILE_FILE="%%t/raw3.profraw" %run %t/binary 2>&1 | FileCheck %s -check-prefix MISSING
 // RUN: llvm-profdata show ./default.profraw | FileCheck %s -check-prefix TMPDIR
 
 // TMPDIR: Maximum function count: 1
 
 // MISSING: Unable to get the TMPDIR environment variable, referenced in {{.*}}raw3.profraw. Using the default path.
 
 int main() { return 0; }