https://github.com/dyung created https://github.com/llvm/llvm-project/pull/108771
Reverts llvm/llvm-project#107734 The test modified in this commit, hip-cuid-hash.hip is failing on MacOS: - https://lab.llvm.org/buildbot/#/builders/190/builds/5764 - https://lab.llvm.org/buildbot/#/builders/23/builds/3020 >From f5d42938f209cb1f814ef8db78c7755fe31e2c5c Mon Sep 17 00:00:00 2001 From: dyung <douglas.y...@sony.com> Date: Sun, 15 Sep 2024 09:37:28 -0700 Subject: [PATCH] Revert "[HIP] Use original file path for CUID (#107734)" This reverts commit 9fc789d922ddf1c849f62bdfbe034f3cd9354967. --- clang/lib/Driver/Driver.cpp | 5 ++++- clang/test/Driver/hip-cuid-hash.hip | 12 +++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/clang/lib/Driver/Driver.cpp b/clang/lib/Driver/Driver.cpp index 758fd744fd46c2..efe398dd531da7 100644 --- a/clang/lib/Driver/Driver.cpp +++ b/clang/lib/Driver/Driver.cpp @@ -3034,7 +3034,10 @@ class OffloadingActionBuilder final { else if (UseCUID == CUID_Hash) { llvm::MD5 Hasher; llvm::MD5::MD5Result Hash; - Hasher.update(IA->getInputArg().getValue()); + SmallString<256> RealPath; + llvm::sys::fs::real_path(IA->getInputArg().getValue(), RealPath, + /*expand_tilde=*/true); + Hasher.update(RealPath); for (auto *A : Args) { if (A->getOption().matches(options::OPT_INPUT)) continue; diff --git a/clang/test/Driver/hip-cuid-hash.hip b/clang/test/Driver/hip-cuid-hash.hip index 6987a98470c6c7..103a1cbf26d50a 100644 --- a/clang/test/Driver/hip-cuid-hash.hip +++ b/clang/test/Driver/hip-cuid-hash.hip @@ -1,15 +1,13 @@ // Check CUID generated by hash. // The same CUID is generated for the same file with the same options. -// RUN: cd %S - // RUN: %clang -### -x hip --target=x86_64-unknown-linux-gnu --no-offload-new-driver \ // RUN: --offload-arch=gfx906 -c -nogpuinc -nogpulib -fuse-cuid=hash \ -// RUN: Inputs/hip_multiple_inputs/a.cu >%t.out 2>&1 +// RUN: %S/Inputs/hip_multiple_inputs/a.cu >%t.out 2>&1 // RUN: %clang -### -x hip --target=x86_64-unknown-linux-gnu --no-offload-new-driver \ // RUN: --offload-arch=gfx906 -c -nogpuinc -nogpulib -fuse-cuid=hash \ -// RUN: Inputs/hip_multiple_inputs/a.cu >>%t.out 2>&1 +// RUN: %S/Inputs/hip_multiple_inputs/a.cu >>%t.out 2>&1 // RUN: FileCheck %s -check-prefixes=SAME -input-file %t.out @@ -18,15 +16,15 @@ // RUN: %clang -### -x hip --target=x86_64-unknown-linux-gnu -DX=1 --no-offload-new-driver \ // RUN: --offload-arch=gfx906 -c -nogpuinc -nogpulib -fuse-cuid=hash \ -// RUN: Inputs/hip_multiple_inputs/a.cu >%t.out 2>&1 +// RUN: %S/Inputs/hip_multiple_inputs/a.cu >%t.out 2>&1 // RUN: %clang -### -x hip --target=x86_64-unknown-linux-gnu -DX=2 --no-offload-new-driver \ // RUN: --offload-arch=gfx906 -c -nogpuinc -nogpulib -fuse-cuid=hash \ -// RUN: Inputs/../Inputs/hip_multiple_inputs/a.cu >>%t.out 2>&1 +// RUN: %S/Inputs/../Inputs/hip_multiple_inputs/a.cu >>%t.out 2>&1 // RUN: FileCheck %s -check-prefixes=DIFF -input-file %t.out -// SAME: "-cc1"{{.*}} "-target-cpu" "gfx906" {{.*}}"-cuid=[[CUID:3c08c1ef86ef439d]]" +// SAME: "-cc1"{{.*}} "-target-cpu" "gfx906" {{.*}}"-cuid=[[CUID:[0-9a-f]+]]" // SAME: "-cc1"{{.*}} "-target-cpu" "gfx906" {{.*}}"-cuid=[[CUID]]" // DIFF: "-cc1"{{.*}} "-target-cpu" "gfx906" {{.*}}"-cuid=[[CUID:[0-9a-f]+]]" _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
