[clang] clang: Remove requires system from hip driver tests (PR #167623)
Matt Arsenault via cfe-commits
cfe-commits at lists.llvm.org
Tue Nov 11 20:58:58 PST 2025
https://github.com/arsenm updated https://github.com/llvm/llvm-project/pull/167623
>From 73fa0907ac2f043807f1db0821501f48341aaa14 Mon Sep 17 00:00:00 2001
From: Matt Arsenault <Matthew.Arsenault at amd.com>
Date: Wed, 13 Nov 2024 16:29:20 -0800
Subject: [PATCH 1/3] clang: Remove requires system from hip driver tests
---
clang/test/Driver/hip-temps-linux.hip | 7 +++----
clang/test/Driver/hip-temps-windows.hip | 7 +++----
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/clang/test/Driver/hip-temps-linux.hip b/clang/test/Driver/hip-temps-linux.hip
index 83a7528dd4560..4baca58b7ef5e 100644
--- a/clang/test/Driver/hip-temps-linux.hip
+++ b/clang/test/Driver/hip-temps-linux.hip
@@ -1,18 +1,17 @@
// 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
// RUN: mkdir -p %t/mytmp
-// RUN: env TMPDIR="%t/mytmp" %clang --target=x86_64-linux-gnu -nogpulib -nogpuinc \
+// RUN: env TMP="%t/mytmp" 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 -check-prefixes=CHECK -DOUTPUT_PATH="%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 {{"?}}[[OUTPUT_PATH]]hip-temps-linux-gfx1030-{{.*}}.bc{{"?}}
int main() {}
diff --git a/clang/test/Driver/hip-temps-windows.hip b/clang/test/Driver/hip-temps-windows.hip
index ac1ac208a65dc..055bbbf52f957 100644
--- a/clang/test/Driver/hip-temps-windows.hip
+++ b/clang/test/Driver/hip-temps-windows.hip
@@ -1,18 +1,17 @@
// REQUIRES: x86-registered-target
// REQUIRES: amdgpu-registered-target
-// REQUIRES: system-windows
// Check no temporary files or directores are left after compilation.
// RUN: rm -rf %t/mytmp
// RUN: mkdir -p %t/mytmp
-// RUN: env TMP="%t/mytmp" %clang --target=x86_64-pc-windows-msvc -nogpulib -nogpuinc \
+// RUN: env TMP="%t/mytmp" TMPDIR="%t/mytmp" %clang --target=x86_64-pc-windows-msvc -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 -check-prefixes=CHECK -DOUTPUT_PATH="%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-windows-gfx1030-{{.*}}.bc"
+// CHECK: -o [[OUTPUT_PATH]]hip-temps-windows-gfx1030-{{.*}}.bc
int main() {}
>From 9aa8b8e20f9b0912b10194d5aae89c42e4437fae Mon Sep 17 00:00:00 2001
From: Matt Arsenault <Matthew.Arsenault at amd.com>
Date: Tue, 11 Nov 2025 19:43:56 -0800
Subject: [PATCH 2/3] try unquoting and repeat env
---
clang/test/Driver/hip-temps-linux.hip | 2 +-
clang/test/Driver/hip-temps-windows.hip | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/clang/test/Driver/hip-temps-linux.hip b/clang/test/Driver/hip-temps-linux.hip
index 4baca58b7ef5e..0670d15c2aebf 100644
--- a/clang/test/Driver/hip-temps-linux.hip
+++ b/clang/test/Driver/hip-temps-linux.hip
@@ -4,7 +4,7 @@
// Check no temporary files or directores are left after compilation.
// RUN: rm -rf %t/mytmp
// RUN: mkdir -p %t/mytmp
-// RUN: env TMP="%t/mytmp" TMPDIR="%t/mytmp" %clang --target=x86_64-linux-gnu -nogpulib -nogpuinc \
+// RUN: env TMP=%t/mytmp 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 -DOUTPUT_PATH="%t%{fs-sep}mytmp%{fs-sep}" %s
diff --git a/clang/test/Driver/hip-temps-windows.hip b/clang/test/Driver/hip-temps-windows.hip
index 055bbbf52f957..f951a1ea7015b 100644
--- a/clang/test/Driver/hip-temps-windows.hip
+++ b/clang/test/Driver/hip-temps-windows.hip
@@ -4,7 +4,7 @@
// Check no temporary files or directores are left after compilation.
// RUN: rm -rf %t/mytmp
// RUN: mkdir -p %t/mytmp
-// RUN: env TMP="%t/mytmp" TMPDIR="%t/mytmp" %clang --target=x86_64-pc-windows-msvc -nogpulib -nogpuinc \
+// RUN: env TMP=%t/mytmp env TMPDIR=%t/mytmp %clang --target=x86_64-pc-windows-msvc -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 -DOUTPUT_PATH="%t%{fs-sep}mytmp%{fs-sep}" %s
>From ac138ba8e5a9861e7dda74ee102575f1c5cfeb3b Mon Sep 17 00:00:00 2001
From: Matt Arsenault <Matthew.Arsenault at amd.com>
Date: Tue, 11 Nov 2025 20:58:13 -0800
Subject: [PATCH 3/3] try not using \ to break long run lines
---
clang/test/Driver/hip-temps-linux.hip | 5 +----
clang/test/Driver/hip-temps-windows.hip | 5 +----
2 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/clang/test/Driver/hip-temps-linux.hip b/clang/test/Driver/hip-temps-linux.hip
index 0670d15c2aebf..0e56afc34412f 100644
--- a/clang/test/Driver/hip-temps-linux.hip
+++ b/clang/test/Driver/hip-temps-linux.hip
@@ -4,10 +4,7 @@
// Check no temporary files or directores are left after compilation.
// RUN: rm -rf %t/mytmp
// RUN: mkdir -p %t/mytmp
-// RUN: env TMP=%t/mytmp 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 -DOUTPUT_PATH="%t%{fs-sep}mytmp%{fs-sep}" %s
+// RUN: env TMP=%t/mytmp env TMPDIR=%t/mytmp %clang --target=x86_64-linux-gnu -nogpulib -nogpuinc --rocm-path=%S/Inputs/rocm -nostdinc -nostdlib -c --offload-arch=gfx1030 -emit-llvm -v %s 2>&1 | FileCheck -check-prefixes=CHECK -DOUTPUT_PATH="%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
diff --git a/clang/test/Driver/hip-temps-windows.hip b/clang/test/Driver/hip-temps-windows.hip
index f951a1ea7015b..cd99ce9ccd0b1 100644
--- a/clang/test/Driver/hip-temps-windows.hip
+++ b/clang/test/Driver/hip-temps-windows.hip
@@ -4,10 +4,7 @@
// Check no temporary files or directores are left after compilation.
// RUN: rm -rf %t/mytmp
// RUN: mkdir -p %t/mytmp
-// RUN: env TMP=%t/mytmp env TMPDIR=%t/mytmp %clang --target=x86_64-pc-windows-msvc -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 -DOUTPUT_PATH="%t%{fs-sep}mytmp%{fs-sep}" %s
+// RUN: env TMP=%t/mytmp env TMPDIR=%t/mytmp %clang --target=x86_64-pc-windows-msvc -nogpulib -nogpuinc --rocm-path=%S/Inputs/rocm -nostdinc -nostdlib -c --offload-arch=gfx1030 -emit-llvm -v %s 2>&1 | FileCheck -check-prefixes=CHECK -DOUTPUT_PATH="%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
More information about the cfe-commits
mailing list