This is an archive of the discontinued LLVM Phabricator instance.

Differential D142506

[AMDGCN] Fix device lib test to work with lib64
ClosedPublic

Authored by scchan on Jan 24 2023, 2:17 PM.

Details

Reviewers
yaxunl
mgorny
Commits
rG56184bb3ad3f: [AMDGCN] Fix device lib test to work with lib64
Summary

This change fixes an issue introduced by
https://reviews.llvm.org/D140315. A new unit test was added to validate
the search for the device libraries being placed in Clang's resource
directory; however, the test didn't take into account that certain
platforms use lib64 for 64-bit library directory.

Change-Id: I8b2ae01899214aef63f4e593c3a509dbf54582ef

Diff Detail

Event Timeline

scchan created this revision.Jan 24 2023, 2:17 PM
Herald added a project: Restricted Project. · View Herald TranscriptJan 24 2023, 2:17 PM
Herald added subscribers: kosarev, jvesely. · View Herald Transcript
scchan requested review of this revision.Jan 24 2023, 2:17 PM
Herald added a project: Restricted Project. · View Herald TranscriptJan 24 2023, 2:17 PM
Herald added a subscriber: cfe-commits. · View Herald Transcript
yaxunl accepted this revision.Jan 24 2023, 2:20 PM

LGTM. Thanks.

This revision is now accepted and ready to land.Jan 24 2023, 2:20 PM
arsenm added a subscriber: arsenm.Jan 24 2023, 2:21 PM

The resource directory should be strictly controlled. why would lib64 ever be used here?

scchan added a comment.Jan 24 2023, 3:01 PM
In D142506#4078402, @arsenm wrote:

The resource directory should be strictly controlled. why would lib64 ever be used here?

The intention is to eventually move the device libs into the library directory inside clang's resource directory, which its name is affected LLVM_LIBDIR_SUFFIX.

Harbormaster completed remote builds in B209747: Diff 491911.Jan 24 2023, 5:14 PM
This revision was landed with ongoing or failed builds.Jan 25 2023, 6:56 AM
Closed by commit rG56184bb3ad3f: [AMDGCN] Fix device lib test to work with lib64 (authored by scchan). · Explain Why
This revision was automatically updated to reflect the committed changes.
scchan added a commit: rG56184bb3ad3f: [AMDGCN] Fix device lib test to work with lib64.
arsenm added a comment.Jan 25 2023, 8:22 AM
In D142506#4078532, @scchan wrote:
In D142506#4078402, @arsenm wrote:

The resource directory should be strictly controlled. why would lib64 ever be used here?

The intention is to eventually move the device libs into the library directory inside clang's resource directory, which its name is affected LLVM_LIBDIR_SUFFIX.

The resource directory is the directory above lib64, there's no reason to put this in something configurable

hvdijk mentioned this in D140315: [AMDGCN] Update search path for device libraries.Apr 12 2023, 4:42 PM

Revision Contents

Diff 492099

clang/test/Driver/Inputs/rocm_resource_dir/lib64/amdgcn/bitcode/asanrtl.bc

  • This file was added.
This is an empty file.

clang/test/Driver/Inputs/rocm_resource_dir/lib64/amdgcn/bitcode/hip.bc

  • This file was added.
This is an empty file.

clang/test/Driver/Inputs/rocm_resource_dir/lib64/amdgcn/bitcode/ockl.bc

  • This file was added.
This is an empty file.

clang/test/Driver/Inputs/rocm_resource_dir/lib64/amdgcn/bitcode/oclc_abi_version_400.bc

  • This file was added.
This is an empty file.

clang/test/Driver/Inputs/rocm_resource_dir/lib64/amdgcn/bitcode/oclc_abi_version_500.bc

  • This file was added.
This is an empty file.

clang/test/Driver/Inputs/rocm_resource_dir/lib64/amdgcn/bitcode/oclc_correctly_rounded_sqrt_off.bc

  • This file was added.
This is an empty file.

clang/test/Driver/Inputs/rocm_resource_dir/lib64/amdgcn/bitcode/oclc_correctly_rounded_sqrt_on.bc

  • This file was added.
This is an empty file.

clang/test/Driver/Inputs/rocm_resource_dir/lib64/amdgcn/bitcode/oclc_daz_opt_off.bc

  • This file was added.
This is an empty file.

clang/test/Driver/Inputs/rocm_resource_dir/lib64/amdgcn/bitcode/oclc_daz_opt_on.bc

  • This file was added.
This is an empty file.

clang/test/Driver/Inputs/rocm_resource_dir/lib64/amdgcn/bitcode/oclc_finite_only_off.bc

  • This file was added.
This is an empty file.

clang/test/Driver/Inputs/rocm_resource_dir/lib64/amdgcn/bitcode/oclc_finite_only_on.bc

  • This file was added.
This is an empty file.

clang/test/Driver/Inputs/rocm_resource_dir/lib64/amdgcn/bitcode/oclc_isa_version_1010.bc

  • This file was added.
This is an empty file.

clang/test/Driver/Inputs/rocm_resource_dir/lib64/amdgcn/bitcode/oclc_isa_version_1011.bc

  • This file was added.
This is an empty file.

clang/test/Driver/Inputs/rocm_resource_dir/lib64/amdgcn/bitcode/oclc_isa_version_1012.bc

  • This file was added.
This is an empty file.

clang/test/Driver/Inputs/rocm_resource_dir/lib64/amdgcn/bitcode/oclc_isa_version_803.bc

  • This file was added.
This is an empty file.

clang/test/Driver/Inputs/rocm_resource_dir/lib64/amdgcn/bitcode/oclc_isa_version_900.bc

  • This file was added.
This is an empty file.

clang/test/Driver/Inputs/rocm_resource_dir/lib64/amdgcn/bitcode/oclc_isa_version_908.bc

  • This file was added.
This is an empty file.

clang/test/Driver/Inputs/rocm_resource_dir/lib64/amdgcn/bitcode/oclc_unsafe_math_off.bc

  • This file was added.
This is an empty file.

clang/test/Driver/Inputs/rocm_resource_dir/lib64/amdgcn/bitcode/oclc_unsafe_math_on.bc

  • This file was added.
This is an empty file.

clang/test/Driver/Inputs/rocm_resource_dir/lib64/amdgcn/bitcode/oclc_wavefrontsize64_off.bc

  • This file was added.
This is an empty file.

clang/test/Driver/Inputs/rocm_resource_dir/lib64/amdgcn/bitcode/oclc_wavefrontsize64_on.bc

  • This file was added.
This is an empty file.

clang/test/Driver/Inputs/rocm_resource_dir/lib64/amdgcn/bitcode/ocml.bc

  • This file was added.
This is an empty file.

clang/test/Driver/Inputs/rocm_resource_dir/lib64/amdgcn/bitcode/opencl.bc

  • This file was added.
This is an empty file.

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

Show First 20 Lines • Show All 197 Lines • ▼ Show 20 Lines
// RUN: -mcode-object-version=5 \ // RUN: -mcode-object-version=5 \
// RUN: --hip-device-lib-path=%S/Inputs/rocm/amdgcn/bitcode-no-abi-ver \ // RUN: --hip-device-lib-path=%S/Inputs/rocm/amdgcn/bitcode-no-abi-ver \
// RUN: --rocm-path=%S/Inputs/rocm %S/Inputs/hip_multiple_inputs/b.hip \ // RUN: --rocm-path=%S/Inputs/rocm %S/Inputs/hip_multiple_inputs/b.hip \
// RUN: 2>&1 | FileCheck %s --check-prefixes=NOABI5 // RUN: 2>&1 | FileCheck %s --check-prefixes=NOABI5
// ALL-NOT: error: // ALL-NOT: error:
// ALL: {{"[^"]*clang[^"]*"}} // ALL: {{"[^"]*clang[^"]*"}}
// RESDIR-SAME: "-mlink-builtin-bitcode" "[[DEVICELIB_DIR:[^"]+(/|\\\\)rocm_resource_dir(/|\\\\)lib(/|\\\\)amdgcn(/|\\\\).*]]hip.bc" // RESDIR-SAME: "-mlink-builtin-bitcode" "[[DEVICELIB_DIR:[^"]+(/|\\\\)rocm_resource_dir(/|\\\\)lib(64)?(/|\\\\)amdgcn(/|\\\\).*]]hip.bc"
// ROCMDIR-SAME: "-mlink-builtin-bitcode" "[[DEVICELIB_DIR:[^"]+(/|\\\\)rocm(/|\\\\)amdgcn(/|\\\\).*]]hip.bc" // ROCMDIR-SAME: "-mlink-builtin-bitcode" "[[DEVICELIB_DIR:[^"]+(/|\\\\)rocm(/|\\\\)amdgcn(/|\\\\).*]]hip.bc"
// ALL-SAME: "-mlink-builtin-bitcode" "[[DEVICELIB_DIR]]ocml.bc" // ALL-SAME: "-mlink-builtin-bitcode" "[[DEVICELIB_DIR]]ocml.bc"
// ALL-SAME: "-mlink-builtin-bitcode" "[[DEVICELIB_DIR]]ockl.bc" // ALL-SAME: "-mlink-builtin-bitcode" "[[DEVICELIB_DIR]]ockl.bc"
// FLUSHD-SAME: "-mlink-builtin-bitcode" "[[DEVICELIB_DIR]]oclc_daz_opt_on.bc" // FLUSHD-SAME: "-mlink-builtin-bitcode" "[[DEVICELIB_DIR]]oclc_daz_opt_on.bc"
// NOFLUSHD-SAME: "-mlink-builtin-bitcode" "[[DEVICELIB_DIR]]oclc_daz_opt_off.bc" // NOFLUSHD-SAME: "-mlink-builtin-bitcode" "[[DEVICELIB_DIR]]oclc_daz_opt_off.bc"
Show All 35 Lines