Author: Yaxun (Sam) Liu Date: 2023-10-04T11:05:16-04:00 New Revision: ba01ce60665848478ba4e76190907153a8c26fe9
URL: https://github.com/llvm/llvm-project/commit/ba01ce60665848478ba4e76190907153a8c26fe9 DIFF: https://github.com/llvm/llvm-project/commit/ba01ce60665848478ba4e76190907153a8c26fe9.diff LOG: Fix test hip-offload-compress-zlib.hip and hip-offload-compress-zstd.hip. For failure https://lab.llvm.org/buildbot/#/builders/231/builds/16710 We cannot do real linking for x86_64 on certain systems, so we do -### instead. Added: Modified: clang/test/Driver/hip-offload-compress-zlib.hip clang/test/Driver/hip-offload-compress-zstd.hip Removed: ################################################################################ diff --git a/clang/test/Driver/hip-offload-compress-zlib.hip b/clang/test/Driver/hip-offload-compress-zlib.hip index 8bfaf376279efda..a29b6d037350d47 100644 --- a/clang/test/Driver/hip-offload-compress-zlib.hip +++ b/clang/test/Driver/hip-offload-compress-zlib.hip @@ -20,28 +20,26 @@ // Test uncompress of bundled bitcode. -// RUN: %clang --hip-link -v --target=x86_64-linux-gnu \ +// RUN: %clang --hip-link -### -v --target=x86_64-linux-gnu \ // RUN: --offload-arch=gfx1100 --offload-arch=gfx1101 \ // RUN: -fgpu-rdc -nogpulib \ // RUN: %T/a.bc --offload-device-only \ // RUN: 2>&1 | FileCheck -check-prefix=UNBUNDLE %s -// UNBUNDLE: clang-offload-bundler{{.*}} -type=bc +// UNBUNDLE: clang-offload-bundler{{.*}} "-type=bc" // UNBUNDLE-SAME: -targets={{.*}}hip-amdgcn-amd-amdhsa-gfx1100,hip-amdgcn-amd-amdhsa-gfx1101 // UNBUNDLE-SAME: -unbundle // UNBUNDLE-SAME: -verbose -// UNBUNDLE: Compressed bundle format // Test compress bundled code objects. -// RUN: %clang -c -v --target=x86_64-linux-gnu \ +// RUN: %clang -c -### -v --target=x86_64-linux-gnu \ // RUN: -x hip --offload-arch=gfx1100 --offload-arch=gfx1101 \ // RUN: -nogpuinc -nogpulib \ // RUN: %S/Inputs/hip_multiple_inputs/a.cu \ // RUN: --offload-compress \ // RUN: 2>&1 | FileCheck -check-prefix=CO %s -// CO: clang-offload-bundler{{.*}} -type=o +// CO: clang-offload-bundler{{.*}} "-type=o" // CO-SAME: -targets={{.*}}hipv4-amdgcn-amd-amdhsa--gfx1100,hipv4-amdgcn-amd-amdhsa--gfx1101 -// CO-SAME: -compress -verbose -// CO: Compressed bundle format +// CO-SAME: "-compress" "-verbose" diff --git a/clang/test/Driver/hip-offload-compress-zstd.hip b/clang/test/Driver/hip-offload-compress-zstd.hip index 6bd6eb0b9192d61..688c2c85329c192 100644 --- a/clang/test/Driver/hip-offload-compress-zstd.hip +++ b/clang/test/Driver/hip-offload-compress-zstd.hip @@ -20,28 +20,26 @@ // Test uncompress of bundled bitcode. -// RUN: %clang --hip-link -v --target=x86_64-linux-gnu \ +// RUN: %clang --hip-link -### -v --target=x86_64-linux-gnu \ // RUN: --offload-arch=gfx1100 --offload-arch=gfx1101 \ // RUN: -fgpu-rdc -nogpulib \ // RUN: %T/a.bc --offload-device-only \ // RUN: 2>&1 | FileCheck -check-prefix=UNBUNDLE %s -// UNBUNDLE: clang-offload-bundler{{.*}} -type=bc +// UNBUNDLE: clang-offload-bundler{{.*}} "-type=bc" // UNBUNDLE-SAME: -targets={{.*}}hip-amdgcn-amd-amdhsa-gfx1100,hip-amdgcn-amd-amdhsa-gfx1101 // UNBUNDLE-SAME: -unbundle // UNBUNDLE-SAME: -verbose -// UNBUNDLE: Compressed bundle format // Test compress bundled code objects. -// RUN: %clang -c -v --target=x86_64-linux-gnu \ +// RUN: %clang -c -### -v --target=x86_64-linux-gnu \ // RUN: -x hip --offload-arch=gfx1100 --offload-arch=gfx1101 \ // RUN: -nogpuinc -nogpulib \ // RUN: %S/Inputs/hip_multiple_inputs/a.cu \ // RUN: --offload-compress \ // RUN: 2>&1 | FileCheck -check-prefix=CO %s -// CO: clang-offload-bundler{{.*}} -type=o +// CO: clang-offload-bundler{{.*}} "-type=o" // CO-SAME: -targets={{.*}}hipv4-amdgcn-amd-amdhsa--gfx1100,hipv4-amdgcn-amd-amdhsa--gfx1101 -// CO-SAME: -compress -verbose -// CO: Compressed bundle format +// CO-SAME: "-compress" "-verbose" _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
