[clang] clang: Remove requires system-linux from some driver tests (PR #111976)
Matt Arsenault via cfe-commits
cfe-commits at lists.llvm.org
Wed Oct 16 08:40:22 PDT 2024
https://github.com/arsenm updated https://github.com/llvm/llvm-project/pull/111976
>From cf55bacc51b83c42320607c10eeb173e3a917e8c Mon Sep 17 00:00:00 2001
From: Matt Arsenault <Matthew.Arsenault at amd.com>
Date: Fri, 11 Oct 2024 14:33:32 +0400
Subject: [PATCH 1/5] clang: Remove requires system-linux from some driver
tests
Works for me on macos.
---
clang/test/Driver/amdgpu-hip-system-arch.c | 1 -
clang/test/Driver/amdgpu-openmp-system-arch-fail.c | 1 -
clang/test/Driver/hip-partial-link.hip | 2 +-
clang/test/Driver/hip-temps-linux.hip | 1 -
clang/test/Driver/linker-wrapper.c | 6 ++----
clang/test/Driver/nvptx-cuda-system-arch.c | 1 -
clang/test/Driver/openmp-system-arch.c | 1 -
7 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/clang/test/Driver/amdgpu-hip-system-arch.c b/clang/test/Driver/amdgpu-hip-system-arch.c
index f25a4087080f6d..7be7b9cad1be02 100644
--- a/clang/test/Driver/amdgpu-hip-system-arch.c
+++ b/clang/test/Driver/amdgpu-hip-system-arch.c
@@ -1,4 +1,3 @@
-// REQUIRES: system-linux
// REQUIRES: shell
// RUN: mkdir -p %t
diff --git a/clang/test/Driver/amdgpu-openmp-system-arch-fail.c b/clang/test/Driver/amdgpu-openmp-system-arch-fail.c
index 85c82e4598cb10..b7e1d0b2c56659 100644
--- a/clang/test/Driver/amdgpu-openmp-system-arch-fail.c
+++ b/clang/test/Driver/amdgpu-openmp-system-arch-fail.c
@@ -1,4 +1,3 @@
-// REQUIRES: system-linux
// REQUIRES: shell
// RUN: mkdir -p %t
diff --git a/clang/test/Driver/hip-partial-link.hip b/clang/test/Driver/hip-partial-link.hip
index 8b27f78f3bdd12..5580e569780194 100644
--- a/clang/test/Driver/hip-partial-link.hip
+++ b/clang/test/Driver/hip-partial-link.hip
@@ -1,4 +1,4 @@
-// REQUIRES: x86-registered-target, amdgpu-registered-target, lld, system-linux
+// REQUIRES: x86-registered-target, amdgpu-registered-target, lld
// RUN: %clang -x hip --target=x86_64-unknown-linux-gnu --no-offload-new-driver \
// RUN: --offload-arch=gfx906 -c -nostdinc -nogpuinc -nohipwrapperinc \
diff --git a/clang/test/Driver/hip-temps-linux.hip b/clang/test/Driver/hip-temps-linux.hip
index 83a7528dd4560a..3fb8a94a3463c8 100644
--- a/clang/test/Driver/hip-temps-linux.hip
+++ b/clang/test/Driver/hip-temps-linux.hip
@@ -1,6 +1,5 @@
// REQUIRES: x86-registered-target
// REQUIRES: amdgpu-registered-target
-// REQUIRES: system-linux
// Check no temporary files or directores are left after compilation.
// RUN: rm -rf %t/mytmp
diff --git a/clang/test/Driver/linker-wrapper.c b/clang/test/Driver/linker-wrapper.c
index 068ea2d7d3c663..976f7c170fdd69 100644
--- a/clang/test/Driver/linker-wrapper.c
+++ b/clang/test/Driver/linker-wrapper.c
@@ -2,8 +2,6 @@
// REQUIRES: nvptx-registered-target
// REQUIRES: amdgpu-registered-target
-// REQUIRES: system-linux
-
// An externally visible variable so static libraries extract.
__attribute__((visibility("protected"), used)) int x;
@@ -30,7 +28,7 @@ __attribute__((visibility("protected"), used)) int x;
// RUN: clang-linker-wrapper --host-triple=x86_64-unknown-linux-gnu --dry-run --device-debug -O0 \
// RUN: --linker-path=/usr/bin/ld %t.o -o a.out 2>&1 | FileCheck %s --check-prefix=NVPTX-LINK-DEBUG
-// NVPTX-LINK-DEBUG: clang{{.*}} -o {{.*}}.img --target=nvptx64-nvidia-cuda -march=sm_70 -O2 -flto {{.*}}.o {{.*}}.o -g
+// NVPTX-LINK-DEBUG: clang{{.*}} -o {{.*}}.img --target=nvptx64-nvidia-cuda -march=sm_70 -O2 -flto {{.*}}.o {{.*}}.o -g
// RUN: clang-offload-packager -o %t.out \
// RUN: --image=file=%t.elf.o,kind=openmp,triple=amdgcn-amd-amdhsa,arch=gfx908 \
@@ -93,7 +91,7 @@ __attribute__((visibility("protected"), used)) int x;
// CUDA: clang{{.*}} -o [[IMG_SM70:.+]] --target=nvptx64-nvidia-cuda -march=sm_70
// CUDA: clang{{.*}} -o [[IMG_SM52:.+]] --target=nvptx64-nvidia-cuda -march=sm_52
-// CUDA: fatbinary{{.*}}-64 --create {{.*}}.fatbin --image=profile=sm_70,file=[[IMG_SM70]] --image=profile=sm_52,file=[[IMG_SM52]]
+// CUDA: fatbinary{{.*}}-64 --create {{.*}}.fatbin --image=profile=sm_70,file=[[IMG_SM70]] --image=profile=sm_52,file=[[IMG_SM52]]
// CUDA: usr/bin/ld{{.*}} {{.*}}.openmp.image.{{.*}}.o {{.*}}.cuda.image.{{.*}}.o
// RUN: clang-offload-packager -o %t.out \
diff --git a/clang/test/Driver/nvptx-cuda-system-arch.c b/clang/test/Driver/nvptx-cuda-system-arch.c
index 6a8a218406d139..b6a7617930fc19 100644
--- a/clang/test/Driver/nvptx-cuda-system-arch.c
+++ b/clang/test/Driver/nvptx-cuda-system-arch.c
@@ -1,4 +1,3 @@
-// REQUIRES: system-linux
// REQUIRES: shell
// RUN: mkdir -p %t
diff --git a/clang/test/Driver/openmp-system-arch.c b/clang/test/Driver/openmp-system-arch.c
index cd49f460099666..75322dae69de46 100644
--- a/clang/test/Driver/openmp-system-arch.c
+++ b/clang/test/Driver/openmp-system-arch.c
@@ -1,4 +1,3 @@
-// REQUIRES: system-linux
// REQUIRES: shell
// RUN: mkdir -p %t
>From 1f29b4982d177b61109ed6f2d69458eb35bcf5f8 Mon Sep 17 00:00:00 2001
From: Matt Arsenault <Matthew.Arsenault at amd.com>
Date: Tue, 15 Oct 2024 21:57:26 +0400
Subject: [PATCH 2/5] Add xfail zos to 3 tests
---
clang/test/Driver/amdgpu-hip-system-arch.c | 1 +
clang/test/Driver/nvptx-cuda-system-arch.c | 1 +
clang/test/Driver/openmp-system-arch.c | 1 +
3 files changed, 3 insertions(+)
diff --git a/clang/test/Driver/amdgpu-hip-system-arch.c b/clang/test/Driver/amdgpu-hip-system-arch.c
index 7be7b9cad1be02..9c27bc09fb36cf 100644
--- a/clang/test/Driver/amdgpu-hip-system-arch.c
+++ b/clang/test/Driver/amdgpu-hip-system-arch.c
@@ -1,4 +1,5 @@
// REQUIRES: shell
+// XFAIL: target={{.*}}-zos{{.*}}
// RUN: mkdir -p %t
// RUN: cp %S/Inputs/amdgpu-arch/amdgpu_arch_fail %t/
diff --git a/clang/test/Driver/nvptx-cuda-system-arch.c b/clang/test/Driver/nvptx-cuda-system-arch.c
index b6a7617930fc19..c54eeac73f73b5 100644
--- a/clang/test/Driver/nvptx-cuda-system-arch.c
+++ b/clang/test/Driver/nvptx-cuda-system-arch.c
@@ -1,4 +1,5 @@
// REQUIRES: shell
+// XFAIL: target={{.*}}-zos{{.*}}
// RUN: mkdir -p %t
// RUN: cp %S/Inputs/nvptx-arch/nvptx_arch_fail %t/
diff --git a/clang/test/Driver/openmp-system-arch.c b/clang/test/Driver/openmp-system-arch.c
index 75322dae69de46..d097c6bc065484 100644
--- a/clang/test/Driver/openmp-system-arch.c
+++ b/clang/test/Driver/openmp-system-arch.c
@@ -1,4 +1,5 @@
// REQUIRES: shell
+// XFAIL: target={{.*}}-zos{{.*}}
// RUN: mkdir -p %t
// RUN: cp %S/Inputs/amdgpu-arch/amdgpu_arch_fail %t/
>From 6ff9c59ed86efb10c2eca2ce87d0799fc25a2bbb Mon Sep 17 00:00:00 2001
From: Matt Arsenault <Matthew.Arsenault at amd.com>
Date: Wed, 16 Oct 2024 09:09:24 +0400
Subject: [PATCH 3/5] Fix path separator check on windows
---
clang/test/Driver/hip-temps-linux.hip | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/clang/test/Driver/hip-temps-linux.hip b/clang/test/Driver/hip-temps-linux.hip
index 3fb8a94a3463c8..c04121268bf697 100644
--- a/clang/test/Driver/hip-temps-linux.hip
+++ b/clang/test/Driver/hip-temps-linux.hip
@@ -2,16 +2,16 @@
// REQUIRES: amdgpu-registered-target
// Check no temporary files or directores are left after compilation.
-// RUN: rm -rf %t/mytmp
-// RUN: mkdir -p %t/mytmp
+// RUN: rm -rf %t%{fs-sep}mytmp
+// RUN: mkdir -p %t%{fs-sep}mytmp
// RUN: env TMPDIR="%t/mytmp" %clang --target=x86_64-linux-gnu -nogpulib -nogpuinc \
// RUN: --rocm-path=%S/Inputs/rocm -nostdinc -nostdlib -c \
// RUN: --offload-arch=gfx1030 -emit-llvm -v %s 2>&1 | \
-// RUN: FileCheck -check-prefixes=CHECK %s
+// RUN: FileCheck -DTMPDIR=%t%{fs-sep}mytmp%{fs-sep} %s
// RUN: ls %t/mytmp >%t/mytmp.txt 2>&1
// RUN: touch %t/empty.txt
// RUN: diff %t/mytmp.txt %t/empty.txt
-// CHECK: -o {{.*}}/mytmp/hip-temps-linux-gfx1030-{{.*}}.bc
+// CHECK: -o {{.*}}[[TMPDIR]]hip-temps-linux-gfx1030-{{.*}}.bc
int main() {}
>From 305eac17e1341862a56099a5bdb1c6dfc7040ea5 Mon Sep 17 00:00:00 2001
From: Matt Arsenault <Matthew.Arsenault at amd.com>
Date: Wed, 16 Oct 2024 16:01:54 +0400
Subject: [PATCH 4/5] Try to fix windows
---
clang/test/Driver/hip-temps-linux.hip | 5 +++--
clang/test/Driver/linker-wrapper.c | 4 ++--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/clang/test/Driver/hip-temps-linux.hip b/clang/test/Driver/hip-temps-linux.hip
index c04121268bf697..12968ebdd024c7 100644
--- a/clang/test/Driver/hip-temps-linux.hip
+++ b/clang/test/Driver/hip-temps-linux.hip
@@ -4,8 +4,9 @@
// Check no temporary files or directores are left after compilation.
// RUN: rm -rf %t%{fs-sep}mytmp
// RUN: mkdir -p %t%{fs-sep}mytmp
-// RUN: env TMPDIR="%t/mytmp" %clang --target=x86_64-linux-gnu -nogpulib -nogpuinc \
-// RUN: --rocm-path=%S/Inputs/rocm -nostdinc -nostdlib -c \
+// RUN: env TMPDIR="%t/mytmp" TMP="%t/mytmp" %clang --target=x86_64-linux-gnu \
+// RUN: -nogpulib -nogpuinc -nostdinc -nostdlib \
+// RUN: --rocm-path=%S/Inputs/rocm -c \
// RUN: --offload-arch=gfx1030 -emit-llvm -v %s 2>&1 | \
// RUN: FileCheck -DTMPDIR=%t%{fs-sep}mytmp%{fs-sep} %s
// RUN: ls %t/mytmp >%t/mytmp.txt 2>&1
diff --git a/clang/test/Driver/linker-wrapper.c b/clang/test/Driver/linker-wrapper.c
index 976f7c170fdd69..89492ee9574cb8 100644
--- a/clang/test/Driver/linker-wrapper.c
+++ b/clang/test/Driver/linker-wrapper.c
@@ -118,7 +118,7 @@ __attribute__((visibility("protected"), used)) int x;
// HIP: clang{{.*}} -o [[IMG_GFX90A:.+]] --target=amdgcn-amd-amdhsa -mcpu=gfx90a
// HIP: clang{{.*}} -o [[IMG_GFX908:.+]] --target=amdgcn-amd-amdhsa -mcpu=gfx908
-// HIP: clang-offload-bundler{{.*}}-type=o -bundle-align=4096 -compress -compression-level=6 -targets=host-x86_64-unknown-linux,hip-amdgcn-amd-amdhsa--gfx90a,hip-amdgcn-amd-amdhsa--gfx908 -input=/dev/null -input=[[IMG_GFX90A]] -input=[[IMG_GFX908]] -output={{.*}}.hipfb
+// HIP: clang-offload-bundler{{.*}}-type=o -bundle-align=4096 -compress -compression-level=6 -targets=host-x86_64-unknown-linux,hip-amdgcn-amd-amdhsa--gfx90a,hip-amdgcn-amd-amdhsa--gfx908 -input={{/dev/null|NUL}} -input=[[IMG_GFX90A]] -input=[[IMG_GFX908]] -output={{.*}}.hipfb
// RUN: clang-offload-packager -o %t.out \
// RUN: --image=file=%t.elf.o,kind=openmp,triple=amdgcn-amd-amdhsa,arch=gfx908 \
@@ -209,7 +209,7 @@ __attribute__((visibility("protected"), used)) int x;
// RUN: %t.o -o a.out 2>&1 | FileCheck %s --check-prefix=RELOCATABLE-LINK-HIP
// RELOCATABLE-LINK-HIP: clang{{.*}} -o {{.*}}.img --target=amdgcn-amd-amdhsa
-// RELOCATABLE-LINK-HIP: clang-offload-bundler{{.*}} -type=o -bundle-align=4096 -targets=host-x86_64-unknown-linux,hip-amdgcn-amd-amdhsa--gfx90a -input=/dev/null -input={{.*}} -output={{.*}}
+// RELOCATABLE-LINK-HIP: clang-offload-bundler{{.*}} -type=o -bundle-align=4096 -targets=host-x86_64-unknown-linux,hip-amdgcn-amd-amdhsa--gfx90a -input={{/dev/null|NUL}} -input={{.*}} -output={{.*}}
// RELOCATABLE-LINK-HIP: /usr/bin/ld.lld{{.*}}-r
// RELOCATABLE-LINK-HIP: llvm-objcopy{{.*}}a.out --remove-section .llvm.offloading
>From 0d43cbadcc290c1df50921fed35cabc98bdfabd4 Mon Sep 17 00:00:00 2001
From: Matt Arsenault <Matthew.Arsenault at amd.com>
Date: Wed, 16 Oct 2024 17:47:51 +0400
Subject: [PATCH 5/5] Try to fix windows
---
clang/test/Driver/hip-temps-linux.hip | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/clang/test/Driver/hip-temps-linux.hip b/clang/test/Driver/hip-temps-linux.hip
index 12968ebdd024c7..387ea81e25fce0 100644
--- a/clang/test/Driver/hip-temps-linux.hip
+++ b/clang/test/Driver/hip-temps-linux.hip
@@ -1,10 +1,11 @@
// REQUIRES: x86-registered-target
// REQUIRES: amdgpu-registered-target
-// Check no temporary files or directores are left after compilation.
+// Check no temporary files or directories are left after compilation.
+
// RUN: rm -rf %t%{fs-sep}mytmp
// RUN: mkdir -p %t%{fs-sep}mytmp
-// RUN: env TMPDIR="%t/mytmp" TMP="%t/mytmp" %clang --target=x86_64-linux-gnu \
+// RUN: env TMPDIR="%t/mytmp" TEMP="%t/mytmp" TMP="%t/mytmp" %clang --target=x86_64-linux-gnu \
// RUN: -nogpulib -nogpuinc -nostdinc -nostdlib \
// RUN: --rocm-path=%S/Inputs/rocm -c \
// RUN: --offload-arch=gfx1030 -emit-llvm -v %s 2>&1 | \
More information about the cfe-commits
mailing list