clang: Remove requires system-linux from some driver tests #111976

arsenm · 2024-10-11T10:45:51Z

Works for me on macos.

arsenm · 2024-10-11T10:46:00Z

This stack of pull requests is managed by Graphite. Learn more about stacking.

llvmbot · 2024-10-11T10:47:07Z

@llvm/pr-subscribers-clang

@llvm/pr-subscribers-clang-driver

Author: Matt Arsenault (arsenm)

Changes

Works for me on macos.

Full diff: https://github.com/llvm/llvm-project/pull/111976.diff

7 Files Affected:

(modified) clang/test/Driver/amdgpu-hip-system-arch.c (-1)
(modified) clang/test/Driver/amdgpu-openmp-system-arch-fail.c (-1)
(modified) clang/test/Driver/hip-partial-link.hip (+1-1)
(modified) clang/test/Driver/hip-temps-linux.hip (-1)
(modified) clang/test/Driver/linker-wrapper.c (+2-4)
(modified) clang/test/Driver/nvptx-cuda-system-arch.c (-1)
(modified) clang/test/Driver/openmp-system-arch.c (-1)

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 c8451ec81ed37e..0bb8a848f80718 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

perry-ca

Three of these tests will fail on z/OS when the requires is removed. It would be great if they can be fixed so they work on z/OS. None of these are available or supported on z/OS so marking them as unsupported on system-zos is also an option.

@daltenty do you want to check AIX too?
Thanks.

perry-ca · 2024-10-11T15:07:56Z

clang/test/Driver/amdgpu-hip-system-arch.c

@@ -1,4 +1,3 @@
-// REQUIRES: system-linux


The compile & test on line 47 is failing on z/OS with the following message:

clang: error: cannot determine amdgcn architecture: No AMD GPU detected in the system; consider passing it via '--offload-arch'; environment variable CLANG_TOOLCHAIN_PROGRAM_TIMEOUT specifies the tool timeout (integer secs, <=0 is infinite)

I'm not sure if there is a way to fix this (eg. wildcard in the expected output or a compiler option). If there isn't can you add:

UNSUPPORTED: system-zos

This can't really be a property of zos or any other system. It works for me on systems without AMDGPUs and other OSes. You are seeing the error after the environment variable parse error, so why did this proceed beyond that point?

That should have been line 26. The error is causing the failure. The env var isn't set for that compilation.

perry-ca · 2024-10-11T15:28:04Z

clang/test/Driver/nvptx-cuda-system-arch.c

@@ -1,4 +1,3 @@
-// REQUIRES: system-linux


This is failing on z/OS on line 28 (ARCH_sm70 check). The actual cc1 line is:

clang: warning: CUDA version is newer than the latest partially supported version 12.5 [-Wunknown-cuda-version] clang: error: cannot determine nvptx64 architecture: No NVIDIA GPU detected in the system; consider passing it via '--offload-arch'; environment variable CLANG_TOOLCHAIN_PROGRAM_TIMEOUT specifies the tool timeout (integer secs, <=0 is infinite) "/plex/perry/llvm/Woz/build/bin/clang-20" "-cc1" "-triple" "nvptx64-nvidia-cuda" "-aux-triple" "x86_64-unknown-linux-gnu" "-S" "-dumpdir" "a-" "-disable-free" "-clear-ast-before-backend" "-disable-llvm-verifier" "-discard-value-names" "-main-file-name" "nvptx-cuda-system-arch.c" "-mrelocation-model" "static" "-mframe-pointer=all" "-fno-rounding-math" "-no-integrated-as" "-aux-target-cpu" "x86-64" "-fcuda-is-device" "-mllvm" "-enable-memcpyopt-without-libcalls" "-fcuda-allow-variadic-functions" "-target-cpu" "sm_52" "-target-feature" "+ptx85" "-debugger-tuning=gdb" "-fno-dwarf-directory-asm" "-fdebug-compilation-dir=/plex/perry/llvm/Woz/llvm-project/clang/test/Driver" "-resource-dir" "/plex/perry/llvm/Woz/build/lib/clang/20" "-internal-isystem" "/plex/perry/llvm/Woz/build/lib/clang/20/include/cuda_wrappers" "-include" "__clang_cuda_runtime_wrapper.h" "-internal-isystem" "/plex/perry/llvm/Woz/build/lib/clang/20/include" "-internal-isystem" "/usr/local/include" "-internal-externc-isystem" "/include" "-internal-externc-isystem" "/usr/include" "-internal-isystem" "/plex/perry/llvm/Woz/llvm-project/clang/test/Driver/Inputs/CUDA_102/usr/local/cuda/include" "-internal-isystem" "/plex/perry/llvm/Woz/build/lib/clang/20/include" "-internal-isystem" "/usr/local/include" "-internal-externc-isystem" "/include" "-internal-externc-isystem" "/usr/include" "-fdeprecated-macro" "-fno-autolink" "-ferror-limit" "19" "-nogpulib" "-fgnuc-version=4.2.1" "-mno-csect" "-fskip-odr-check-in-gmf" "-fcxx-exceptions" "-fexceptions" "-fexec-charset" "UTF-8" "-fcolor-diagnostics" "-cuid=15151f95f8ae4b17" "-D__GCC_HAVE_DWARF2_CFI_ASM=1" "-o" "/plex/perry/tmp/nvptx-cuda-system-arch-sm_52-77f5c9.s" "-x" "cuda" "/plex/perry/llvm/Woz/llvm-project/clang/test/Driver/nvptx-cuda-system-arch.c"

This has sm_52 as the target_gpu instead of sm_70. Can you either fix it or add:

UNSUPPORTED: system-zos

The result should definitely be sm_70, that's what the provided script produces

I agree. By fixing it, I was referring to the code in clang that determines this value. If it's easy to make the test pass on z/OS great. If not marking it as unsupported works too. This applies to my other comment too.

It's the output from a shell script in clang/test/Driver/Inputs/nvptx-arch/nvptx_arch_sm_70

How could the zos test find a different result

I'm looking into that question. The first thing I noticed was the temp file is being created and read as a binary file. I also noticed that the output of the script is not being redirected into the temp file. I'll get a PR up to fix these problems once I get it solved.

I think that mean the only issue on z/OS is not related to these tests. Could you mark the 3 failing tests as XFAIL for system-zos. I'll remove that once I have the problem fixed.

perry-ca · 2024-10-11T15:36:48Z

clang/test/Driver/openmp-system-arch.c

@@ -1,4 +1,3 @@
-// REQUIRES: system-linux


This is failing on z/OS on line 33 with the error:

clang: error: failed to deduce triple for target architecture 'native'; specify the triple using '-fopenmp-targets' and '-Xopenmp-target' instead

Not deducing the target gpu causes wrong -target-cpu to be specified.

If it can be fixed great. If not can you add:

UNSUPPORTED: system-zos

perry-ca

LGTM. Thanks Matt.

…4067) PR #111976 was enabling the tests updated in the PR to run on all systems. We found a few didn't run on z/OS. I tracked the problem down to: 1. the ExecuteToolChainProgram() function wasn't passing the executable name as the first arg. That was causing exec on z/OS to fail. 2. the temp file needs to be a text file so codepage conversion happens.

…m#114067) PR llvm#111976 was enabling the tests updated in the PR to run on all systems. We found a few didn't run on z/OS. I tracked the problem down to: 1. the ExecuteToolChainProgram() function wasn't passing the executable name as the first arg. That was causing exec on z/OS to fail. 2. the temp file needs to be a text file so codepage conversion happens.

Works for me on macos.

arsenm mentioned this pull request Oct 11, 2024

clang: Fix hipstdpar test relying on default target #111975

Merged

arsenm added the clang:driver 'clang' and 'clang++' user-facing binaries. Not 'clang-cl' label Oct 11, 2024 — with Graphite App

arsenm requested review from AlexVlx, perry-ca and yxsamliu October 11, 2024 10:46

arsenm marked this pull request as ready for review October 11, 2024 10:46

llvmbot added clang Clang issues not falling into any other category backend:AMDGPU labels Oct 11, 2024

perry-ca reviewed Oct 11, 2024

View reviewed changes

Base automatically changed from users/arsenm/hipstdpar-fix-host-dependent-test to main October 15, 2024 05:45

arsenm force-pushed the users/arsenm/hip-partial-link-remove-requires-linux branch from fee09ae to b63c440 Compare October 15, 2024 18:03

This was referenced Oct 15, 2024

clang/HIP: Remove REQUIRES windows from a test #112411

Merged

clang/HIP: Remove REQUIRES libgcc from a test #112412

Merged

perry-ca approved these changes Oct 15, 2024

View reviewed changes

arsenm force-pushed the users/arsenm/hip-partial-link-remove-requires-linux branch 3 times, most recently from 0d43cba to e2dfde6 Compare October 18, 2024 05:48

arsenm mentioned this pull request Oct 18, 2024

clang/HIP: Remove requires system-linux from some driver tests #112842

Merged

arsenm force-pushed the users/arsenm/hip-partial-link-remove-requires-linux branch from e2dfde6 to c73e500 Compare October 28, 2024 22:31

perry-ca mentioned this pull request Oct 29, 2024

Pass the executable name as arg[0] when calling ExecuteAndWait() #114067

Merged

arsenm force-pushed the users/arsenm/hip-partial-link-remove-requires-linux branch 3 times, most recently from 8c678b6 to e26a8f2 Compare November 5, 2024 21:37

arsenm force-pushed the users/arsenm/hip-partial-link-remove-requires-linux branch from e26a8f2 to 655a5fb Compare November 13, 2024 18:29

arsenm added 2 commits November 13, 2024 13:27

clang: Remove requires system-linux from some driver tests

7391edf

Works for me on macos.

Add xfail zos to 3 tests

4d58a45

arsenm added 8 commits November 13, 2024 13:27

Fix path separator check on windows

9222ae6

Try to fix windows

b83188d

Try to fix windows

fa1d253

Revert the hard cases

d0c8d62

More fs-sep

51889a8

Try again and relax the windows test too

4adfe13

Try again

76c629a

Revert the hard cases

99da25f

arsenm force-pushed the users/arsenm/hip-partial-link-remove-requires-linux branch from 655a5fb to 99da25f Compare November 14, 2024 00:30

arsenm merged commit 03730cd into main Nov 14, 2024
8 checks passed

arsenm deleted the users/arsenm/hip-partial-link-remove-requires-linux branch November 14, 2024 16:37

This was referenced Mar 7, 2025

clang: Switch linker-wrapper test to unsupported windows #130247

Merged

clang: Enable linker-wrapper test on windows #130248

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

clang: Remove requires system-linux from some driver tests #111976

clang: Remove requires system-linux from some driver tests #111976

Uh oh!

arsenm commented Oct 11, 2024

Uh oh!

arsenm commented Oct 11, 2024 •

edited

Loading

Uh oh!

llvmbot commented Oct 11, 2024 •

edited

Loading

Uh oh!

perry-ca left a comment

Uh oh!

perry-ca Oct 11, 2024

Uh oh!

arsenm Oct 11, 2024

Uh oh!

perry-ca Oct 11, 2024

Uh oh!

perry-ca Oct 11, 2024

Uh oh!

arsenm Oct 11, 2024

Uh oh!

perry-ca Oct 11, 2024

Uh oh!

arsenm Oct 11, 2024

Uh oh!

perry-ca Oct 11, 2024

Uh oh!

perry-ca Oct 11, 2024

Uh oh!

perry-ca left a comment

Uh oh!

Uh oh!

Uh oh!

clang: Remove requires system-linux from some driver tests #111976

clang: Remove requires system-linux from some driver tests #111976

Uh oh!

Conversation

arsenm commented Oct 11, 2024

Uh oh!

arsenm commented Oct 11, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

llvmbot commented Oct 11, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

perry-ca left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

perry-ca left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

arsenm commented Oct 11, 2024 •

edited

Loading

llvmbot commented Oct 11, 2024 •

edited

Loading