This is an archive of the discontinued LLVM Phabricator instance.

Differential D133998

[HIP][test] Avoid %T
ClosedPublic

Authored by MaskRay on Sep 15 2022, 5:23 PM.

Details

Reviewers
tra
yaxunl
Commits
rG9e1c1ecb148e: [HIP][test] Avoid %T
Summary

%T is a deprecated lit feature. It refers to the parent directory.
When two tests in test/Driver refer to the same %T/foo, they are racy with each other.
%t includes the test name and is safe for use.

Diff Detail

Event Timeline

MaskRay created this revision.Sep 15 2022, 5:23 PM
Herald added a project: Restricted Project. · View Herald TranscriptSep 15 2022, 5:23 PM
Herald added a subscriber: StephenFan. · View Herald Transcript
MaskRay requested review of this revision.Sep 15 2022, 5:23 PM
Herald added a project: Restricted Project. · View Herald TranscriptSep 15 2022, 5:23 PM
Herald added a subscriber: cfe-commits. · View Herald Transcript
tra accepted this revision.Sep 15 2022, 5:24 PM
This revision is now accepted and ready to land.Sep 15 2022, 5:24 PM
MaskRay updated this revision to Diff 460569.Sep 15 2022, 5:29 PM

fix all hip-*

MaskRay edited the summary of this revision. (Show Details)Sep 15 2022, 5:35 PM
Harbormaster completed remote builds in B186992: Diff 460569.Sep 15 2022, 5:56 PM
This revision was landed with ongoing or failed builds.Sep 15 2022, 7:58 PM
Closed by commit rG9e1c1ecb148e: [HIP][test] Avoid %T (authored by MaskRay). · Explain Why
This revision was automatically updated to reflect the committed changes.
MaskRay added a commit: rG9e1c1ecb148e: [HIP][test] Avoid %T.
probinson added subscribers: lamb-j, probinson.Oct 25 2022, 12:44 PM

@MaskRay I see that you restored the clang-driver keyword in hip-link-bc-to-bc.hip, and of course that keyword is not defined anywhere so the test is never being run.
Is there an issue filed to track this? Or is the original author aware? @lamb-j

MaskRay added a comment.Oct 25 2022, 2:08 PM
In D133998#3883517, @probinson wrote:

@MaskRay I see that you restored the clang-driver keyword in hip-link-bc-to-bc.hip, and of course that keyword is not defined anywhere so the test is never being run.
Is there an issue filed to track this? Or is the original author aware? @lamb-j

Thanks for reporting the issue. I forgot to mention it. You are right that Driver/hip-link-bc-to-bc.hip needs fixing @lamb-j

probinson added a comment.Oct 31 2022, 1:04 PM

I filed #58711 to get the test fixed; in the meantime, removed clang-driver and added XFAIL: * in rG7af01fe4

Revision Contents

PathSize
clang/
test/
Driver/
9 lines

Diff 460565

clang/test/Driver/hip-link-bundle-archive.hip

// REQUIRES: x86-registered-target, amdgpu-registered-target // REQUIRES: x86-registered-target, amdgpu-registered-target
// Check clang unbundle the archive and link them by lld. // Check clang unbundle the archive and link them by lld.
// RUN: touch %T/libhipBundled.a // RUN: rm -rf %t && mkdir %t
// RUN: touch %t/libhipBundled.a
// RUN: %clang -### --offload-arch=gfx906 --offload-arch=gfx1030 \ // RUN: %clang -### --offload-arch=gfx906 --offload-arch=gfx1030 \
// RUN: --target=x86_64-unknown-linux-gnu \ // RUN: --target=x86_64-unknown-linux-gnu \
// RUN: -nogpulib %s -fgpu-rdc -L%T -lhipBundled \ // RUN: -nogpulib %s -fgpu-rdc -L%t -lhipBundled \
// RUN: 2>&1 | FileCheck -check-prefix=GNU %s // RUN: 2>&1 | FileCheck -check-prefix=GNU %s
// RUN: touch %T/hipBundled2.lib // RUN: touch %t/hipBundled2.lib
// RUN: %clang -### --offload-arch=gfx906 --offload-arch=gfx1030 \ // RUN: %clang -### --offload-arch=gfx906 --offload-arch=gfx1030 \
// RUN: --target=x86_64-pc-windows-msvc \ // RUN: --target=x86_64-pc-windows-msvc \
// RUN: -nogpulib %s -fgpu-rdc -L%T -lhipBundled2 \ // RUN: -nogpulib %s -fgpu-rdc -L%t -lhipBundled2 \
// RUN: 2>&1 | FileCheck -check-prefix=MSVC %s // RUN: 2>&1 | FileCheck -check-prefix=MSVC %s
// GNU: "{{.*}}clang-offload-bundler" "-unbundle" "-type=a" "-input={{.*}}libhipBundled.a" "-targets=hip-amdgcn-amd-amdhsa-gfx1030" "-output=[[A1030:.*\.a]]" "-allow-missing-bundles" // GNU: "{{.*}}clang-offload-bundler" "-unbundle" "-type=a" "-input={{.*}}libhipBundled.a" "-targets=hip-amdgcn-amd-amdhsa-gfx1030" "-output=[[A1030:.*\.a]]" "-allow-missing-bundles"
// GNU: "{{.*}}lld{{.*}}" {{.*}}"-plugin-opt=mcpu=gfx1030" {{.*}} "[[A1030]]" // GNU: "{{.*}}lld{{.*}}" {{.*}}"-plugin-opt=mcpu=gfx1030" {{.*}} "[[A1030]]"
// GNU: "{{.*}}clang-offload-bundler" "-unbundle" "-type=a" "-input={{.*}}libhipBundled.a" "-targets=hip-amdgcn-amd-amdhsa-gfx906" "-output=[[A906:.*\.a]]" "-allow-missing-bundles" // GNU: "{{.*}}clang-offload-bundler" "-unbundle" "-type=a" "-input={{.*}}libhipBundled.a" "-targets=hip-amdgcn-amd-amdhsa-gfx906" "-output=[[A906:.*\.a]]" "-allow-missing-bundles"
// GNU: "{{.*}}lld{{.*}}" {{.*}}"-plugin-opt=mcpu=gfx906" {{.*}} "[[A906]]" // GNU: "{{.*}}lld{{.*}}" {{.*}}"-plugin-opt=mcpu=gfx906" {{.*}} "[[A906]]"
// GNU: "{{.*}}ld{{.*}}" {{.*}}"-o" "a.out" {{.*}}"-lhipBundled" // GNU: "{{.*}}ld{{.*}}" {{.*}}"-o" "a.out" {{.*}}"-lhipBundled"
// MSVC: "{{.*}}clang-offload-bundler" "-unbundle" "-type=a" "-input={{.*}}hipBundled2.lib" "-targets=hip-amdgcn-amd-amdhsa-gfx1030" "-output=[[A1030:.*\.a]]" "-allow-missing-bundles" // MSVC: "{{.*}}clang-offload-bundler" "-unbundle" "-type=a" "-input={{.*}}hipBundled2.lib" "-targets=hip-amdgcn-amd-amdhsa-gfx1030" "-output=[[A1030:.*\.a]]" "-allow-missing-bundles"
// MSVC: "{{.*}}lld{{.*}}" {{.*}}"-plugin-opt=mcpu=gfx1030" {{.*}} "[[A1030]]" // MSVC: "{{.*}}lld{{.*}}" {{.*}}"-plugin-opt=mcpu=gfx1030" {{.*}} "[[A1030]]"
// MSVC: "{{.*}}clang-offload-bundler" "-unbundle" "-type=a" "-input={{.*}}hipBundled2.lib" "-targets=hip-amdgcn-amd-amdhsa-gfx906" "-output=[[A906:.*\.a]]" "-allow-missing-bundles" // MSVC: "{{.*}}clang-offload-bundler" "-unbundle" "-type=a" "-input={{.*}}hipBundled2.lib" "-targets=hip-amdgcn-amd-amdhsa-gfx906" "-output=[[A906:.*\.a]]" "-allow-missing-bundles"
// MSVC: "{{.*}}lld{{.*}}" {{.*}}"-plugin-opt=mcpu=gfx906" {{.*}} "[[A906]]" // MSVC: "{{.*}}lld{{.*}}" {{.*}}"-plugin-opt=mcpu=gfx906" {{.*}} "[[A906]]"
// MSVC: "{{.*}}link{{.*}}" {{.*}}"-out:a.exe" {{.*}}"hipBundled2.lib" // MSVC: "{{.*}}link{{.*}}" {{.*}}"-out:a.exe" {{.*}}"hipBundled2.lib"