This is an archive of the discontinued LLVM Phabricator instance.

Differential D120557

[HIP] File device library ABI version file name
ClosedPublic

Authored by yaxunl on Feb 25 2022, 5:29 AM.

Details

Reviewers
tra
Commits
rG092f15ac40ce: [HIP] File device library ABI version file name
Summary

It should be oclc_abi_version* instead of abi_version*.

Diff Detail

Event Timeline

yaxunl created this revision.Feb 25 2022, 5:29 AM
Herald added subscribers: kerbowa, jvesely. · View Herald TranscriptFeb 25 2022, 5:29 AM
yaxunl requested review of this revision.Feb 25 2022, 5:29 AM
Harbormaster completed remote builds in B151462: Diff 411387.Feb 25 2022, 6:08 AM
tra accepted this revision.Feb 28 2022, 12:13 PM
This revision is now accepted and ready to land.Feb 28 2022, 12:13 PM
This revision was landed with ongoing or failed builds.Feb 28 2022, 1:25 PM
Closed by commit rG092f15ac40ce: [HIP] File device library ABI version file name (authored by yaxunl). · Explain Why
This revision was automatically updated to reflect the committed changes.
yaxunl added a commit: rG092f15ac40ce: [HIP] File device library ABI version file name.
Herald added a project: Restricted Project. · View Herald TranscriptFeb 28 2022, 1:25 PM

Revision Contents

PathSize
clang/
lib/
Driver/
ToolChains/
2 lines
test/
Driver/
Inputs/
rocm/
amdgcn/
bitcode/
8 lines

Diff 411387

clang/lib/Driver/ToolChains/AMDGPU.cpp

Show First 20 Lines • Show All 85 Lines • ▼ Show 20 Lines if (!FileName.endswith(Suffix))
continue; continue;
StringRef BaseName; StringRef BaseName;
if (FileName.endswith(Suffix2)) if (FileName.endswith(Suffix2))
BaseName = FileName.drop_back(Suffix2.size()); BaseName = FileName.drop_back(Suffix2.size());
else if (FileName.endswith(Suffix)) else if (FileName.endswith(Suffix))
BaseName = FileName.drop_back(Suffix.size()); BaseName = FileName.drop_back(Suffix.size());
const StringRef ABIVersionPrefix = "abi_version_"; const StringRef ABIVersionPrefix = "oclc_abi_version_";
if (BaseName == "ocml") { if (BaseName == "ocml") {
OCML = FilePath; OCML = FilePath;
} else if (BaseName == "ockl") { } else if (BaseName == "ockl") {
OCKL = FilePath; OCKL = FilePath;
} else if (BaseName == "opencl") { } else if (BaseName == "opencl") {
OpenCL = FilePath; OpenCL = FilePath;
} else if (BaseName == "hip") { } else if (BaseName == "hip") {
HIP = FilePath; HIP = FilePath;
▲ Show 20 Lines • Show All 874 Lines • Show Last 20 Lines

clang/test/Driver/Inputs/rocm/amdgcn/bitcode/abi_version_400.bc

  • This file was deleted.
The contents of this file were not changed.

clang/test/Driver/Inputs/rocm/amdgcn/bitcode/abi_version_500.bc

  • This file was deleted.
The contents of this file were not changed.

clang/test/Driver/hip-device-libs.hip

Show First 20 Lines • Show All 211 Lines • ▼ Show 20 Lines
// UNSAFE-SAME: "-mlink-builtin-bitcode" "{{.*}}oclc_correctly_rounded_sqrt_on.bc" // UNSAFE-SAME: "-mlink-builtin-bitcode" "{{.*}}oclc_correctly_rounded_sqrt_on.bc"
// DIVSQRT: "-mlink-builtin-bitcode" "{{.*}}oclc_daz_opt_off.bc" // DIVSQRT: "-mlink-builtin-bitcode" "{{.*}}oclc_daz_opt_off.bc"
// DIVSQRT-SAME: "-mlink-builtin-bitcode" "{{.*}}oclc_unsafe_math_off.bc" // DIVSQRT-SAME: "-mlink-builtin-bitcode" "{{.*}}oclc_unsafe_math_off.bc"
// DIVSQRT-SAME: "-mlink-builtin-bitcode" "{{.*}}oclc_finite_only_off.bc" // DIVSQRT-SAME: "-mlink-builtin-bitcode" "{{.*}}oclc_finite_only_off.bc"
// DIVSQRT-SAME: "-mlink-builtin-bitcode" "{{.*}}oclc_correctly_rounded_sqrt_off.bc" // DIVSQRT-SAME: "-mlink-builtin-bitcode" "{{.*}}oclc_correctly_rounded_sqrt_off.bc"
// ABI4-NOT: error: // ABI4-NOT: error:
// ABI4: "-mlink-builtin-bitcode" "{{.*}}abi_version_400.bc" // ABI4: "-mlink-builtin-bitcode" "{{.*}}oclc_abi_version_400.bc"
// ABI5-NOT: error: // ABI5-NOT: error:
// ABI5: "-mlink-builtin-bitcode" "{{.*}}abi_version_500.bc" // ABI5: "-mlink-builtin-bitcode" "{{.*}}oclc_abi_version_500.bc"
// NOABI4-NOT: error: // NOABI4-NOT: error:
// NOABI4-NOT: "-mlink-builtin-bitcode" "{{.*}}abi_version_400.bc" // NOABI4-NOT: "-mlink-builtin-bitcode" "{{.*}}oclc_abi_version_400.bc"
// NOABI4-NOT: "-mlink-builtin-bitcode" "{{.*}}abi_version_500.bc" // NOABI4-NOT: "-mlink-builtin-bitcode" "{{.*}}oclc_abi_version_500.bc"
// NOABI5: error: cannot find ROCm device libraryfor ABI version 5; provide its path via '--rocm-path' or '--rocm-device-lib-path', or pass '-nogpulib' to build without ROCm device library // NOABI5: error: cannot find ROCm device libraryfor ABI version 5; provide its path via '--rocm-path' or '--rocm-device-lib-path', or pass '-nogpulib' to build without ROCm device library