Skip to content

Commit ba01ce6

Browse files
committed
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.
1 parent 8d6d4f8 commit ba01ce6

File tree

2 files changed

+10
-14
lines changed

2 files changed

+10
-14
lines changed

clang/test/Driver/hip-offload-compress-zlib.hip

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,28 +20,26 @@
2020

2121
// Test uncompress of bundled bitcode.
2222

23-
// RUN: %clang --hip-link -v --target=x86_64-linux-gnu \
23+
// RUN: %clang --hip-link -### -v --target=x86_64-linux-gnu \
2424
// RUN: --offload-arch=gfx1100 --offload-arch=gfx1101 \
2525
// RUN: -fgpu-rdc -nogpulib \
2626
// RUN: %T/a.bc --offload-device-only \
2727
// RUN: 2>&1 | FileCheck -check-prefix=UNBUNDLE %s
2828

29-
// UNBUNDLE: clang-offload-bundler{{.*}} -type=bc
29+
// UNBUNDLE: clang-offload-bundler{{.*}} "-type=bc"
3030
// UNBUNDLE-SAME: -targets={{.*}}hip-amdgcn-amd-amdhsa-gfx1100,hip-amdgcn-amd-amdhsa-gfx1101
3131
// UNBUNDLE-SAME: -unbundle
3232
// UNBUNDLE-SAME: -verbose
33-
// UNBUNDLE: Compressed bundle format
3433

3534
// Test compress bundled code objects.
3635

37-
// RUN: %clang -c -v --target=x86_64-linux-gnu \
36+
// RUN: %clang -c -### -v --target=x86_64-linux-gnu \
3837
// RUN: -x hip --offload-arch=gfx1100 --offload-arch=gfx1101 \
3938
// RUN: -nogpuinc -nogpulib \
4039
// RUN: %S/Inputs/hip_multiple_inputs/a.cu \
4140
// RUN: --offload-compress \
4241
// RUN: 2>&1 | FileCheck -check-prefix=CO %s
4342

44-
// CO: clang-offload-bundler{{.*}} -type=o
43+
// CO: clang-offload-bundler{{.*}} "-type=o"
4544
// CO-SAME: -targets={{.*}}hipv4-amdgcn-amd-amdhsa--gfx1100,hipv4-amdgcn-amd-amdhsa--gfx1101
46-
// CO-SAME: -compress -verbose
47-
// CO: Compressed bundle format
45+
// CO-SAME: "-compress" "-verbose"

clang/test/Driver/hip-offload-compress-zstd.hip

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,28 +20,26 @@
2020

2121
// Test uncompress of bundled bitcode.
2222

23-
// RUN: %clang --hip-link -v --target=x86_64-linux-gnu \
23+
// RUN: %clang --hip-link -### -v --target=x86_64-linux-gnu \
2424
// RUN: --offload-arch=gfx1100 --offload-arch=gfx1101 \
2525
// RUN: -fgpu-rdc -nogpulib \
2626
// RUN: %T/a.bc --offload-device-only \
2727
// RUN: 2>&1 | FileCheck -check-prefix=UNBUNDLE %s
2828

29-
// UNBUNDLE: clang-offload-bundler{{.*}} -type=bc
29+
// UNBUNDLE: clang-offload-bundler{{.*}} "-type=bc"
3030
// UNBUNDLE-SAME: -targets={{.*}}hip-amdgcn-amd-amdhsa-gfx1100,hip-amdgcn-amd-amdhsa-gfx1101
3131
// UNBUNDLE-SAME: -unbundle
3232
// UNBUNDLE-SAME: -verbose
33-
// UNBUNDLE: Compressed bundle format
3433

3534
// Test compress bundled code objects.
3635

37-
// RUN: %clang -c -v --target=x86_64-linux-gnu \
36+
// RUN: %clang -c -### -v --target=x86_64-linux-gnu \
3837
// RUN: -x hip --offload-arch=gfx1100 --offload-arch=gfx1101 \
3938
// RUN: -nogpuinc -nogpulib \
4039
// RUN: %S/Inputs/hip_multiple_inputs/a.cu \
4140
// RUN: --offload-compress \
4241
// RUN: 2>&1 | FileCheck -check-prefix=CO %s
4342

44-
// CO: clang-offload-bundler{{.*}} -type=o
43+
// CO: clang-offload-bundler{{.*}} "-type=o"
4544
// CO-SAME: -targets={{.*}}hipv4-amdgcn-amd-amdhsa--gfx1100,hipv4-amdgcn-amd-amdhsa--gfx1101
46-
// CO-SAME: -compress -verbose
47-
// CO: Compressed bundle format
45+
// CO-SAME: "-compress" "-verbose"

0 commit comments

Comments
 (0)