Skip to content

Commit 79c00c9

Browse files
llvm-beanzllvm-beanz
authored
Merge pull request #8 from llvm-beanz/user/cbieneman/rename-offloader
[NFC] Rename gpu-exec to offloader
2 parents 7c112fa + 0d27b77 commit 79c00c9

15 files changed

+36
-36
lines changed

‎test/Basic/Mandelbrot.test

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,9 @@ DescriptorSets:
7272

7373
# RUN: split-file %s %t
7474
# RUN: %if DirectX %{ dxc -T cs_6_0 -Fo %t.dxil %t/source.hlsl %}
75-
# RUN: %if DirectX %{ %gpu-exec %t/pipeline.yaml %t.dxil | FileCheck %s %}
75+
# RUN: %if DirectX %{ %offloader %t/pipeline.yaml %t.dxil | FileCheck %s %}
7676
# RUN: %if Vulkan %{ dxc -T cs_6_0 -spirv -Fo %t.spv %t/source.hlsl %}
77-
# RUN: %if Vulkan %{ %gpu-exec %t/pipeline.yaml %t.spv | FileCheck %s %}
77+
# RUN: %if Vulkan %{ %offloader %t/pipeline.yaml %t.spv | FileCheck %s %}
7878
# RUN: %if Metal %{ dxc -T cs_6_0 -Fo %t.dxil %t/source.hlsl %}
7979
# RUN: %if Metal %{ metal-shaderconverter %t.dxil -o=%t.metallib %}
80-
# RUN: %if Metal %{ %gpu-exec %t/pipeline.yaml %t.metallib | FileCheck %s %}
80+
# RUN: %if Metal %{ %offloader %t/pipeline.yaml %t.metallib | FileCheck %s %}

‎test/Basic/StructuredBuffer.test

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@ DescriptorSets:
3333
# UNSUPPORTED: Clang
3434
# RUN: split-file %s %t
3535
# RUN: %if DirectX %{ dxc -T cs_6_0 -Fo %t.dxil %t/source.hlsl %}
36-
# RUN: %if DirectX %{ %gpu-exec %t/pipeline.yaml %t.dxil | FileCheck %s %}
36+
# RUN: %if DirectX %{ %offloader %t/pipeline.yaml %t.dxil | FileCheck %s %}
3737
# RUN: %if Vulkan %{ dxc -T cs_6_0 -spirv -fspv-target-env=vulkan1.3 -fvk-use-scalar-layout -Fo %t.spv %t/source.hlsl %}
38-
# RUN: %if Vulkan %{ %gpu-exec %t/pipeline.yaml %t.spv | FileCheck %s %}
38+
# RUN: %if Vulkan %{ %offloader %t/pipeline.yaml %t.spv | FileCheck %s %}
3939

4040
# RUN: %if Metal %{ dxc -T cs_6_0 -Fo %t.dxil %t/source.hlsl %}
4141
# RUN: %if Metal %{ metal-shaderconverter %t.dxil -o=%t.metallib %}
42-
# RUN: %if Metal %{ %gpu-exec %t/pipeline.yaml %t.metallib | FileCheck %s %}
42+
# RUN: %if Metal %{ %offloader %t/pipeline.yaml %t.metallib | FileCheck %s %}
4343

4444

4545
# CHECK: Data: [ 0, 1, 2, 3, 4, 0, 1, 2, 3, 6, 4, 0 ]

‎test/Basic/TestFloat32Pipeline.test

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@ DescriptorSets:
3030
# UNSUPPORTED: Clang
3131
# RUN: split-file %s %t
3232
# RUN: %if DirectX %{ dxc -T cs_6_0 -Fo %t.dxil %t/source.hlsl %}
33-
# RUN: %if DirectX %{ %gpu-exec %t/pipeline.yaml %t.dxil | FileCheck %s %}
33+
# RUN: %if DirectX %{ %offloader %t/pipeline.yaml %t.dxil | FileCheck %s %}
3434
# RUN: %if Vulkan %{ dxc -T cs_6_0 -spirv -Fo %t.spv %t/source.hlsl %}
35-
# RUN: %if Vulkan %{ %gpu-exec %t/pipeline.yaml %t.spv | FileCheck %s %}
35+
# RUN: %if Vulkan %{ %offloader %t/pipeline.yaml %t.spv | FileCheck %s %}
3636
# RUN: %if Metal %{ dxc -T cs_6_0 -Fo %t.dxil %t/source.hlsl %}
3737
# RUN: %if Metal %{ metal-shaderconverter %t.dxil -o=%t.metallib %}
38-
# RUN: %if Metal %{ %gpu-exec %t/pipeline.yaml %t.metallib | FileCheck %s %}
38+
# RUN: %if Metal %{ %offloader %t/pipeline.yaml %t.metallib | FileCheck %s %}
3939

4040
# CHECK: Access: ReadWrite
4141
# CHECK: Format: Float32

‎test/Basic/TestPipeline.test

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ DescriptorSets:
3131
# UNSUPPORTED: Clang
3232
# RUN: split-file %s %t
3333
# RUN: %if DirectX %{ dxc -T cs_6_0 -Fo %t.dxil %t/source.hlsl %}
34-
# RUN: %if DirectX %{ %gpu-exec %t/pipeline.yaml %t.dxil | FileCheck %s %}
34+
# RUN: %if DirectX %{ %offloader %t/pipeline.yaml %t.dxil | FileCheck %s %}
3535
# RUN: %if Vulkan %{ dxc -T cs_6_0 -spirv -Fo %t.spv %t/source.hlsl %}
36-
# RUN: %if Vulkan %{ %gpu-exec %t/pipeline.yaml %t.spv | FileCheck %s %}
36+
# RUN: %if Vulkan %{ %offloader %t/pipeline.yaml %t.spv | FileCheck %s %}
3737
# RUN: %if Metal %{ dxc -T cs_6_0 -Fo %t.dxil %t/source.hlsl %}
3838
# RUN: %if Metal %{ metal-shaderconverter %t.dxil -o=%t.metallib %}
39-
# RUN: %if Metal %{ %gpu-exec %t/pipeline.yaml %t.metallib | FileCheck %s %}
39+
# RUN: %if Metal %{ %offloader %t/pipeline.yaml %t.metallib | FileCheck %s %}
4040

4141
# CHECK: Access: ReadWrite
4242
# CHECK: Format: Int32

‎test/Basic/idiv-edges.test

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,12 @@ DescriptorSets:
4343
# UNSUPPORTED: Clang
4444
# RUN: split-file %s %t
4545
# RUN: %if DirectX %{ dxc -T cs_6_0 -Fo %t.dxil %t/source.hlsl %}
46-
# RUN: %if DirectX %{ %gpu-exec %t/pipeline.yaml %t.dxil | FileCheck %s %}
46+
# RUN: %if DirectX %{ %offloader %t/pipeline.yaml %t.dxil | FileCheck %s %}
4747
# RUN: %if Vulkan %{ dxc -T cs_6_0 -spirv -Fo %t.spv %t/source.hlsl %}
48-
# RUN: %if Vulkan %{ %gpu-exec %t/pipeline.yaml %t.spv | FileCheck %s %}
48+
# RUN: %if Vulkan %{ %offloader %t/pipeline.yaml %t.spv | FileCheck %s %}
4949
# RUN: %if Metal %{ dxc -T cs_6_0 -Fo %t.dxil %t/source.hlsl %}
5050
# RUN: %if Metal %{ metal-shaderconverter %t.dxil -o=%t.metallib %}
51-
# RUN: %if Metal %{ %gpu-exec %t/pipeline.yaml %t.metallib | FileCheck %s %}
51+
# RUN: %if Metal %{ %offloader %t/pipeline.yaml %t.metallib | FileCheck %s %}
5252

5353
# Divide by-zero behavior seems to be erradic enough to call it undefined...
5454

‎test/Basic/simple.test

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,14 @@ DescriptorSets:
3737

3838
# RUN: split-file %s %t
3939
# RUN: %if DirectX %{ dxc -T cs_6_0 -Fo %t.dxil %t/simple.hlsl %}
40-
# RUN: %if DirectX %{ %gpu-exec %t/simple.yaml %t.dxil | FileCheck %s %}
40+
# RUN: %if DirectX %{ %offloader %t/simple.yaml %t.dxil | FileCheck %s %}
4141
# RUN: %if Vulkan %{ dxc -T cs_6_0 -spirv -fspv-target-env=vulkan1.1 -Fo %t.spv %t/simple.hlsl %}
42-
# RUN: %if Vulkan %{ %gpu-exec %t/simple.yaml %t.spv | FileCheck %s %}
42+
# RUN: %if Vulkan %{ %offloader %t/simple.yaml %t.spv | FileCheck %s %}
4343
# XFAIL: Vulkan-NV
4444

4545
# RUN: %if Metal %{ dxc -T cs_6_0 -Fo %t.dxil %t/simple.hlsl %}
4646
# RUN: %if Metal %{ metal-shaderconverter %t.dxil -o=%t.metallib %}
47-
# RUN: %if Metal %{ %gpu-exec %t/simple.yaml %t.metallib | FileCheck %s %}
47+
# RUN: %if Metal %{ %offloader %t/simple.yaml %t.metallib | FileCheck %s %}
4848

4949
# CHECK: Data:
5050
# CHECK: Data: [ 4, 16, 36, 64 ]

‎test/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ endfunction()
5656

5757
list(APPEND HLSLTEST_DEPS
5858
api-query
59-
gpu-exec
59+
offloader
6060
FileCheck
6161
split-file)
6262

‎test/WaveOps/WaveActiveMax.test

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,12 @@ DescriptorSets:
5252
# UNSUPPORTED: Clang
5353
# RUN: split-file %s %t
5454
# RUN: %if DirectX %{ dxc -T cs_6_0 -Fo %t.dxil %t/source.hlsl %}
55-
# RUN: %if DirectX %{ %gpu-exec %t/pipeline.yaml %t.dxil | FileCheck --check-prefixes=CHECK,DX %s %}
55+
# RUN: %if DirectX %{ %offloader %t/pipeline.yaml %t.dxil | FileCheck --check-prefixes=CHECK,DX %s %}
5656
# RUN: %if Vulkan %{ dxc -T cs_6_0 -spirv -fspv-target-env=vulkan1.1 -Fo %t.spv %t/source.hlsl %}
57-
# RUN: %if Vulkan %{ %gpu-exec %t/pipeline.yaml %t.spv | FileCheck %s --check-prefixes=CHECK,VULKAN %}
57+
# RUN: %if Vulkan %{ %offloader %t/pipeline.yaml %t.spv | FileCheck %s --check-prefixes=CHECK,VULKAN %}
5858
# RUN: %if Metal %{ dxc -T cs_6_0 -Fo %t.dxil %t/source.hlsl %}
5959
# RUN: %if Metal %{ metal-shaderconverter %t.dxil -o=%t.metallib %}
60-
# RUN: %if Metal %{ %gpu-exec %t/pipeline.yaml %t.metallib | FileCheck %s --check-prefixes=CHECK,METAL %}
60+
# RUN: %if Metal %{ %offloader %t/pipeline.yaml %t.metallib | FileCheck %s --check-prefixes=CHECK,METAL %}
6161

6262
# The behavior of this operation is consistent on Metal, so the test verifies that behavior.
6363

@@ -83,7 +83,7 @@ DescriptorSets:
8383
# CHECK-NEXT: Format: Float32
8484
# CHECK-NEXT: RawSize: 4
8585
# METAL-NEXT: Data: [ 0, 0, 0, 0 ]
86-
# DX-NEXT: Data:
86+
# DX-NEXT: Data:
8787
# VULKAN-NEXT: Data:
8888
# CHECK: Access: ReadWrite
8989
# CHECK-NEXT: Format: Float32

‎test/WaveOps/WaveActiveSum.test

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@ DescriptorSets:
3232
# UNSUPPORTED: Clang
3333
# RUN: split-file %s %t
3434
# RUN: %if DirectX %{ dxc -T cs_6_0 -Fo %t.dxil %t/source.hlsl %}
35-
# RUN: %if DirectX %{ %gpu-exec %t/pipeline.yaml %t.dxil | FileCheck %s %}
35+
# RUN: %if DirectX %{ %offloader %t/pipeline.yaml %t.dxil | FileCheck %s %}
3636
# RUN: %if Vulkan %{ dxc -T cs_6_0 -spirv -fspv-target-env=vulkan1.1 -Fo %t.spv %t/source.hlsl %}
37-
# RUN: %if Vulkan %{ %gpu-exec %t/pipeline.yaml %t.spv | FileCheck %s %}
37+
# RUN: %if Vulkan %{ %offloader %t/pipeline.yaml %t.spv | FileCheck %s %}
3838
# XFAIL: Vulkan-NV
3939

4040
# RUN: %if Metal %{ dxc -T cs_6_0 -Fo %t.dxil %t/source.hlsl %}
4141
# RUN: %if Metal %{ metal-shaderconverter %t.dxil -o=%t.metallib %}
42-
# RUN: %if Metal %{ %gpu-exec %t/pipeline.yaml %t.metallib | FileCheck %s %}
42+
# RUN: %if Metal %{ %offloader %t/pipeline.yaml %t.metallib | FileCheck %s %}
4343

4444
# CHECK: Data: [ 42, 42, 40, 40 ]

‎test/lit.cfg.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@
4343

4444
if config.hlsltest_test_warp:
4545
config.available_features.add("DirectX-WARP")
46-
tools.append(ToolSubst("%gpu-exec", command=FindTool("gpu-exec"), extra_args=["-warp"]))
46+
tools.append(ToolSubst("%offloader", command=FindTool("offloader"), extra_args=["-warp"]))
4747
else:
48-
tools.append(ToolSubst("%gpu-exec", FindTool("gpu-exec")))
48+
tools.append(ToolSubst("%offloader", FindTool("offloader")))
4949

5050
if config.hlsltest_test_clang:
5151
if os.path.exists(config.hlsltest_dxc_dir):

0 commit comments

Comments
 (0)