Page MenuHomePhabricator

[HIP] Fix HIP test on windows due to lld suffix
ClosedPublic

Authored by ashi1 on Nov 30 2020, 12:49 PM.

Details

Summary

On Windows, lld is instead named lld.exe, therefore
a few HIP tests are failing. Instead the wildcard should
be modified to .*lld.* to handle .exe. This fixes the
bug: https://bugs.llvm.org/show_bug.cgi?id=48289.

Diff Detail

Event Timeline

ashi1 requested review of this revision.Nov 30 2020, 12:49 PM
ashi1 created this revision.

Although there were no issues with .*llvm-mc, as a precaution, I changed it to .*llvm-mc.* too. In case any systems use llvm-mc.exe instead.

tra accepted this revision.Nov 30 2020, 12:58 PM
This revision is now accepted and ready to land.Nov 30 2020, 12:58 PM

Aaron, Could you please update the bugzilla after the fix is landed? Thanks.

ashi1 added a comment.Nov 30 2020, 1:05 PM

Aaron, Could you please update the bugzilla after the fix is landed? Thanks.

Sure I will do that. I just sent an email to bugzilla team for registration.

This revision was automatically updated to reflect the committed changes.
Herald added a project: Restricted Project. · View Herald TranscriptNov 30 2020, 1:06 PM
Herald added a subscriber: cfe-commits. · View Herald Transcript
RKSimon added a subscriber: RKSimon.Dec 1 2020, 3:46 AM

@ashi1 This is causing build failures - please can you take a look ? http://lab.llvm.org:8011/#/builders/14/builds/2514

<stdin>:17:66: note: possible intended match here
 "/b/1/clang-x86_64-debian-new-pass-manager-fast/llvm.obj/bin/llvm-ar" "rcsD" "a.out" "/tmp/a-88f827.o" "/tmp/b-11b5fe.o" "/tmp/a-72b91c.o"
                                                                 ^
Input file: <stdin>
Check file: /b/1/clang-x86_64-debian-new-pass-manager-fast/llvm.src/clang/test/Driver/hip-toolchain-rdc-static-lib.hip
-dump-input=help explains the following input dump.
Input was:
<<<<<<
            .
            .
            .
            9:  "/b/1/clang-x86_64-debian-new-pass-manager-fast/llvm.obj/bin/clang-12" "-cc1" "-triple" "amdgcn-amd-amdhsa" "-aux-triple" "x86_64-unknown-linux-gnu" "-emit-llvm-bc" "-emit-llvm-uselists" "-disable-free" "-main-file-name" "a.cu" "-mrelocation-model" "pic" "-pic-level" "1" "-mframe-pointer=all" "-fdenormal-fp-math-f32=preserve-sign,preserve-sign" "-fno-rounding-math" "-mconstructor-aliases" "-aux-target-cpu" "x86-64" "-fcuda-is-device" "-fgpu-rdc" "-fcuda-allow-variadic-functions" "-fvisibility" "hidden" "-fapply-global-visibility-to-externs" "-target-cpu" "gfx803" "-fno-split-dwarf-inlining" "-debugger-tuning=gdb" "-resource-dir" "/b/1/clang-x86_64-debian-new-pass-manager-fast/llvm.obj/lib/clang/12.0.0" "-internal-isystem" "/b/1/clang-x86_64-debian-new-pass-manager-fast/llvm.obj/lib/clang/12.0.0" "-internal-isystem" "/usr/lib/gcc/x86_64-linux-gnu/8/../../../../include/c++/8" "-internal-isystem" "/usr/lib/gcc/x86_64-linux-gnu/8/../../../../include/x86_64-linux-gnu/c++/8" "-internal-isystem" "/usr/lib/gcc/x86_64-linux-gnu/8/../../../../include/x86_64-linux-gnu/c++/8" "-internal-isystem" "/usr/lib/gcc/x86_64-linux-gnu/8/../../../../include/c++/8/backward" "-internal-isystem" "/usr/lib/gcc/x86_64-linux-gnu/8/../../../../include/c++/8" "-internal-isystem" "/usr/lib/gcc/x86_64-linux-gnu/8/../../../../include/x86_64-linux-gnu/c++/8" "-internal-isystem" "/usr/lib/gcc/x86_64-linux-gnu/8/../../../../include/x86_64-linux-gnu/c++/8" "-internal-isystem" "/usr/lib/gcc/x86_64-linux-gnu/8/../../../../include/c++/8/backward" "-internal-isystem" "/usr/local/include" "-internal-isystem" "/b/1/clang-x86_64-debian-new-pass-manager-fast/llvm.obj/lib/clang/12.0.0/include" "-internal-externc-isystem" "/usr/include/x86_64-linux-gnu" "-internal-externc-isystem" "/include" "-internal-externc-isystem" "/usr/include" "-internal-isystem" "/usr/local/include" "-internal-isystem" "/b/1/clang-x86_64-debian-new-pass-manager-fast/llvm.obj/lib/clang/12.0.0/include" "-internal-externc-isystem" "/usr/include/x86_64-linux-gnu" "-internal-externc-isystem" "/include" "-internal-externc-isystem" "/usr/include" "-std=c++11" "-fdeprecated-macro" "-fno-autolink" "-fdebug-compilation-dir" "/b/1/clang-x86_64-debian-new-pass-manager-fast/llvm.obj/tools/clang/test/Driver" "-ferror-limit" "19" "-fhip-new-launch-api" "-fgnuc-version=4.2.1" "-fcxx-exceptions" "-fexceptions" "-fcuda-allow-variadic-functions" "-munsafe-fp-atomics" "-faddrsig" "-o" "/tmp/a-0292f9.bc" "-x" "hip" "/b/1/clang-x86_64-debian-new-pass-manager-fast/llvm.src/clang/test/Driver/Inputs/hip_multiple_inputs/a.cu"
           10:  "/b/1/clang-x86_64-debian-new-pass-manager-fast/llvm.obj/bin/clang-12" "-cc1" "-triple" "amdgcn-amd-amdhsa" "-aux-triple" "x86_64-unknown-linux-gnu" "-emit-llvm-bc" "-emit-llvm-uselists" "-disable-free" "-main-file-name" "b.hip" "-mrelocation-model" "pic" "-pic-level" "1" "-mframe-pointer=all" "-fdenormal-fp-math-f32=preserve-sign,preserve-sign" "-fno-rounding-math" "-mconstructor-aliases" "-aux-target-cpu" "x86-64" "-fcuda-is-device" "-fgpu-rdc" "-fcuda-allow-variadic-functions" "-fvisibility" "hidden" "-fapply-global-visibility-to-externs" "-target-cpu" "gfx803" "-fno-split-dwarf-inlining" "-debugger-tuning=gdb" "-resource-dir" "/b/1/clang-x86_64-debian-new-pass-manager-fast/llvm.obj/lib/clang/12.0.0" "-internal-isystem" "/b/1/clang-x86_64-debian-new-pass-manager-fast/llvm.obj/lib/clang/12.0.0" "-internal-isystem" "/usr/lib/gcc/x86_64-linux-gnu/8/../../../../include/c++/8" "-internal-isystem" "/usr/lib/gcc/x86_64-linux-gnu/8/../../../../include/x86_64-linux-gnu/c++/8" "-internal-isystem" "/usr/lib/gcc/x86_64-linux-gnu/8/../../../../include/x86_64-linux-gnu/c++/8" "-internal-isystem" "/usr/lib/gcc/x86_64-linux-gnu/8/../../../../include/c++/8/backward" "-internal-isystem" "/usr/lib/gcc/x86_64-linux-gnu/8/../../../../include/c++/8" "-internal-isystem" "/usr/lib/gcc/x86_64-linux-gnu/8/../../../../include/x86_64-linux-gnu/c++/8" "-internal-isystem" "/usr/lib/gcc/x86_64-linux-gnu/8/../../../../include/x86_64-linux-gnu/c++/8" "-internal-isystem" "/usr/lib/gcc/x86_64-linux-gnu/8/../../../../include/c++/8/backward" "-internal-isystem" "/usr/local/include" "-internal-isystem" "/b/1/clang-x86_64-debian-new-pass-manager-fast/llvm.obj/lib/clang/12.0.0/include" "-internal-externc-isystem" "/usr/include/x86_64-linux-gnu" "-internal-externc-isystem" "/include" "-internal-externc-isystem" "/usr/include" "-internal-isystem" "/usr/local/include" "-internal-isystem" "/b/1/clang-x86_64-debian-new-pass-manager-fast/llvm.obj/lib/clang/12.0.0/include" "-internal-externc-isystem" "/usr/include/x86_64-linux-gnu" "-internal-externc-isystem" "/include" "-internal-externc-isystem" "/usr/include" "-std=c++11" "-fdeprecated-macro" "-fno-autolink" "-fdebug-compilation-dir" "/b/1/clang-x86_64-debian-new-pass-manager-fast/llvm.obj/tools/clang/test/Driver" "-ferror-limit" "19" "-fhip-new-launch-api" "-fgnuc-version=4.2.1" "-fcxx-exceptions" "-fexceptions" "-fcuda-allow-variadic-functions" "-munsafe-fp-atomics" "-faddrsig" "-o" "/tmp/b-d71f05.bc" "-x" "hip" "/b/1/clang-x86_64-debian-new-pass-manager-fast/llvm.src/clang/test/Driver/Inputs/hip_multiple_inputs/b.hip"
           11:  "lld" "-flavor" "gnu" "--no-undefined" "-shared" "-plugin-opt=-amdgpu-internalize-symbols" "-plugin-opt=mcpu=gfx803" "-plugin-opt=new-pass-manager" "-o" "/tmp/a-3027d7.out" "/tmp/a-0292f9.bc" "/tmp/b-d71f05.bc"
           12:  "/b/1/clang-x86_64-debian-new-pass-manager-fast/llvm.obj/bin/clang-12" "-cc1" "-triple" "amdgcn-amd-amdhsa" "-aux-triple" "x86_64-unknown-linux-gnu" "-emit-llvm-bc" "-emit-llvm-uselists" "-disable-free" "-main-file-name" "a.cu" "-mrelocation-model" "pic" "-pic-level" "1" "-mframe-pointer=all" "-fno-rounding-math" "-mconstructor-aliases" "-aux-target-cpu" "x86-64" "-fcuda-is-device" "-fgpu-rdc" "-fcuda-allow-variadic-functions" "-fvisibility" "hidden" "-fapply-global-visibility-to-externs" "-target-cpu" "gfx900" "-fno-split-dwarf-inlining" "-debugger-tuning=gdb" "-resource-dir" "/b/1/clang-x86_64-debian-new-pass-manager-fast/llvm.obj/lib/clang/12.0.0" "-internal-isystem" "/b/1/clang-x86_64-debian-new-pass-manager-fast/llvm.obj/lib/clang/12.0.0" "-internal-isystem" "/usr/lib/gcc/x86_64-linux-gnu/8/../../../../include/c++/8" "-internal-isystem" "/usr/lib/gcc/x86_64-linux-gnu/8/../../../../include/x86_64-linux-gnu/c++/8" "-internal-isystem" "/usr/lib/gcc/x86_64-linux-gnu/8/../../../../include/x86_64-linux-gnu/c++/8" "-internal-isystem" "/usr/lib/gcc/x86_64-linux-gnu/8/../../../../include/c++/8/backward" "-internal-isystem" "/usr/lib/gcc/x86_64-linux-gnu/8/../../../../include/c++/8" "-internal-isystem" "/usr/lib/gcc/x86_64-linux-gnu/8/../../../../include/x86_64-linux-gnu/c++/8" "-internal-isystem" "/usr/lib/gcc/x86_64-linux-gnu/8/../../../../include/x86_64-linux-gnu/c++/8" "-internal-isystem" "/usr/lib/gcc/x86_64-linux-gnu/8/../../../../include/c++/8/backward" "-internal-isystem" "/usr/local/include" "-internal-isystem" "/b/1/clang-x86_64-debian-new-pass-manager-fast/llvm.obj/lib/clang/12.0.0/include" "-internal-externc-isystem" "/usr/include/x86_64-linux-gnu" "-internal-externc-isystem" "/include" "-internal-externc-isystem" "/usr/include" "-internal-isystem" "/usr/local/include" "-internal-isystem" "/b/1/clang-x86_64-debian-new-pass-manager-fast/llvm.obj/lib/clang/12.0.0/include" "-internal-externc-isystem" "/usr/include/x86_64-linux-gnu" "-internal-externc-isystem" "/include" "-internal-externc-isystem" "/usr/include" "-std=c++11" "-fdeprecated-macro" "-fno-autolink" "-fdebug-compilation-dir" "/b/1/clang-x86_64-debian-new-pass-manager-fast/llvm.obj/tools/clang/test/Driver" "-ferror-limit" "19" "-fhip-new-launch-api" "-fgnuc-version=4.2.1" "-fcxx-exceptions" "-fexceptions" "-fcuda-allow-variadic-functions" "-munsafe-fp-atomics" "-faddrsig" "-o" "/tmp/a-45f4d2.bc" "-x" "hip" "/b/1/clang-x86_64-debian-new-pass-manager-fast/llvm.src/clang/test/Driver/Inputs/hip_multiple_inputs/a.cu"
           13:  "/b/1/clang-x86_64-debian-new-pass-manager-fast/llvm.obj/bin/clang-12" "-cc1" "-triple" "amdgcn-amd-amdhsa" "-aux-triple" "x86_64-unknown-linux-gnu" "-emit-llvm-bc" "-emit-llvm-uselists" "-disable-free" "-main-file-name" "b.hip" "-mrelocation-model" "pic" "-pic-level" "1" "-mframe-pointer=all" "-fno-rounding-math" "-mconstructor-aliases" "-aux-target-cpu" "x86-64" "-fcuda-is-device" "-fgpu-rdc" "-fcuda-allow-variadic-functions" "-fvisibility" "hidden" "-fapply-global-visibility-to-externs" "-target-cpu" "gfx900" "-fno-split-dwarf-inlining" "-debugger-tuning=gdb" "-resource-dir" "/b/1/clang-x86_64-debian-new-pass-manager-fast/llvm.obj/lib/clang/12.0.0" "-internal-isystem" "/b/1/clang-x86_64-debian-new-pass-manager-fast/llvm.obj/lib/clang/12.0.0" "-internal-isystem" "/usr/lib/gcc/x86_64-linux-gnu/8/../../../../include/c++/8" "-internal-isystem" "/usr/lib/gcc/x86_64-linux-gnu/8/../../../../include/x86_64-linux-gnu/c++/8" "-internal-isystem" "/usr/lib/gcc/x86_64-linux-gnu/8/../../../../include/x86_64-linux-gnu/c++/8" "-internal-isystem" "/usr/lib/gcc/x86_64-linux-gnu/8/../../../../include/c++/8/backward" "-internal-isystem" "/usr/lib/gcc/x86_64-linux-gnu/8/../../../../include/c++/8" "-internal-isystem" "/usr/lib/gcc/x86_64-linux-gnu/8/../../../../include/x86_64-linux-gnu/c++/8" "-internal-isystem" "/usr/lib/gcc/x86_64-linux-gnu/8/../../../../include/x86_64-linux-gnu/c++/8" "-internal-isystem" "/usr/lib/gcc/x86_64-linux-gnu/8/../../../../include/c++/8/backward" "-internal-isystem" "/usr/local/include" "-internal-isystem" "/b/1/clang-x86_64-debian-new-pass-manager-fast/llvm.obj/lib/clang/12.0.0/include" "-internal-externc-isystem" "/usr/include/x86_64-linux-gnu" "-internal-externc-isystem" "/include" "-internal-externc-isystem" "/usr/include" "-internal-isystem" "/usr/local/include" "-internal-isystem" "/b/1/clang-x86_64-debian-new-pass-manager-fast/llvm.obj/lib/clang/12.0.0/include" "-internal-externc-isystem" "/usr/include/x86_64-linux-gnu" "-internal-externc-isystem" "/include" "-internal-externc-isystem" "/usr/include" "-std=c++11" "-fdeprecated-macro" "-fno-autolink" "-fdebug-compilation-dir" "/b/1/clang-x86_64-debian-new-pass-manager-fast/llvm.obj/tools/clang/test/Driver" "-ferror-limit" "19" "-fhip-new-launch-api" "-fgnuc-version=4.2.1" "-fcxx-exceptions" "-fexceptions" "-fcuda-allow-variadic-functions" "-munsafe-fp-atomics" "-faddrsig" "-o" "/tmp/b-be3633.bc" "-x" "hip" "/b/1/clang-x86_64-debian-new-pass-manager-fast/llvm.src/clang/test/Driver/Inputs/hip_multiple_inputs/b.hip"
           14:  "lld" "-flavor" "gnu" "--no-undefined" "-shared" "-plugin-opt=-amdgpu-internalize-symbols" "-plugin-opt=mcpu=gfx900" "-plugin-opt=new-pass-manager" "-o" "/tmp/a-535e54.out" "/tmp/a-45f4d2.bc" "/tmp/b-be3633.bc"
check:74'0      X~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ error: no match found
check:74'1
ashi1 added a comment.Dec 1 2020, 7:36 AM

@ashi1 This is causing build failures - please can you take a look ? http://lab.llvm.org:8011/#/builders/14/builds/2514

<stdin>:17:66: note: possible intended match here
 "/b/1/clang-x86_64-debian-new-pass-manager-fast/llvm.obj/bin/llvm-ar" "rcsD" "a.out" "/tmp/a-88f827.o" "/tmp/b-11b5fe.o" "/tmp/a-72b91c.o"

Thank you, I'm working on pushing a patch ASAP, otherwise I will revert.