Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add SPIR-V 1.4 testing for Image Operands and Loop Controls #2034

Merged
merged 7 commits into from
Oct 22, 2024
Merged

add SPIR-V 1.4 testing for Image Operands and Loop Controls #2034

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6e305db
add testing for the SPIR-V 1.4 Image Operand additions
bashbaug Aug 5, 2024
d471035
add testing for the SPIR-V 1.4 Loop Control additions
bashbaug Aug 5, 2024
592a688
factor out the function to test for SPIR-v 1.4 support
bashbaug Aug 7, 2024
6a1a214
fix filename
bashbaug Aug 12, 2024
c178374
remove unneeded extended instruction set import
bashbaug Aug 12, 2024
57316d1
remove unneeded extern
bashbaug Aug 12, 2024
8b6da90
address review comments
bashbaug Aug 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions test_conformance/spirv_new/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ set(${MODULE_NAME}_SOURCES
test_op_vector_extract.cpp
test_op_vector_insert.cpp
test_op_vector_times_scalar.cpp
test_spirv_14.cpp
)

set(TEST_HARNESS_SOURCES
Expand Down
41 changes: 41 additions & 0 deletions test_conformance/spirv_new/spirvInfo.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
//
// Copyright (c) 2024 The Khronos Group Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//

#pragma once

#include "harness/compat.h"

#include <string>

extern bool gVersionSkip;

static bool is_spirv_version_supported(cl_device_id deviceID,
const char* version)
{
std::string ilVersions = get_device_il_version_string(deviceID);

if (gVersionSkip)
{
log_info(" Skipping version check for %s.\n", version);
return true;
}
else if (ilVersions.find(version) == std::string::npos)
{
return false;
}

return true;
}
37 changes: 37 additions & 0 deletions test_conformance/spirv_new/spirv_asm/spv1.4/image_operand_signextend.spvasm32
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
; SPIR-V
; Version: 1.4
; Generator: Khronos LLVM/SPIR-V Translator; 14
; Bound: 31
; Schema: 0
OpCapability Addresses
OpCapability Linkage
OpCapability Kernel
OpCapability ImageBasic
OpCapability LiteralSampler
OpMemoryModel Physical64 OpenCL
OpEntryPoint Kernel %read_image_test "read_image_test"
OpSource OpenCL_C 102000
%uint = OpTypeInt 32 0
%index_0 = OpConstant %uint 0
%void = OpTypeVoid
%v4uint = OpTypeVector %uint 4
%_ptr_CrossWorkgroup_v4uint = OpTypePointer CrossWorkgroup %v4uint
%image2d_t = OpTypeImage %void 2D 0 0 0 0 Unknown ReadOnly
%7 = OpTypeFunction %void %_ptr_CrossWorkgroup_v4uint %image2d_t
%sampler_t = OpTypeSampler
%sampledimage_t = OpTypeSampledImage %image2d_t
%v2uint = OpTypeVector %uint 2
%float = OpTypeFloat 32
%sampler = OpConstantSampler %sampler_t None 0 Nearest
%coord_0_0 = OpConstantNull %v2uint
%float_0 = OpConstant %float 0
%read_image_test = OpFunction %void None %7
%dst = OpFunctionParameter %_ptr_CrossWorkgroup_v4uint
%image = OpFunctionParameter %image2d_t
%entry = OpLabel
%TempSampledImage = OpSampledImage %sampledimage_t %image %sampler
%call = OpImageSampleExplicitLod %v4uint %TempSampledImage %coord_0_0 Lod|SignExtend %float_0
%arrayidx = OpInBoundsPtrAccessChain %_ptr_CrossWorkgroup_v4uint %dst %index_0
OpStore %arrayidx %call Aligned 16
OpReturn
OpFunctionEnd
39 changes: 39 additions & 0 deletions test_conformance/spirv_new/spirv_asm/spv1.4/image_operand_signextend.spvasm64
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
; SPIR-V
; Version: 1.4
; Generator: Khronos LLVM/SPIR-V Translator; 14
; Bound: 31
; Schema: 0
OpCapability Addresses
OpCapability Linkage
OpCapability Kernel
OpCapability Int64
OpCapability ImageBasic
OpCapability LiteralSampler
OpMemoryModel Physical64 OpenCL
OpEntryPoint Kernel %read_image_test "read_image_test"
OpSource OpenCL_C 102000
%uint = OpTypeInt 32 0
%ulong = OpTypeInt 64 0
%index_0 = OpConstant %ulong 0
%void = OpTypeVoid
%v4uint = OpTypeVector %uint 4
%_ptr_CrossWorkgroup_v4uint = OpTypePointer CrossWorkgroup %v4uint
%image2d_t = OpTypeImage %void 2D 0 0 0 0 Unknown ReadOnly
%7 = OpTypeFunction %void %_ptr_CrossWorkgroup_v4uint %image2d_t
%sampler_t = OpTypeSampler
%sampledimage_t = OpTypeSampledImage %image2d_t
%v2uint = OpTypeVector %uint 2
%float = OpTypeFloat 32
%sampler = OpConstantSampler %sampler_t None 0 Nearest
%coord_0_0 = OpConstantNull %v2uint
%float_0 = OpConstant %float 0
%read_image_test = OpFunction %void None %7
%dst = OpFunctionParameter %_ptr_CrossWorkgroup_v4uint
%image = OpFunctionParameter %image2d_t
%entry = OpLabel
%TempSampledImage = OpSampledImage %sampledimage_t %image %sampler
%call = OpImageSampleExplicitLod %v4uint %TempSampledImage %coord_0_0 Lod|SignExtend %float_0
%arrayidx = OpInBoundsPtrAccessChain %_ptr_CrossWorkgroup_v4uint %dst %index_0
OpStore %arrayidx %call Aligned 16
OpReturn
OpFunctionEnd
37 changes: 37 additions & 0 deletions test_conformance/spirv_new/spirv_asm/spv1.4/image_operand_zeroextend.spvasm32
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
; SPIR-V
; Version: 1.4
; Generator: Khronos LLVM/SPIR-V Translator; 14
; Bound: 31
; Schema: 0
OpCapability Addresses
OpCapability Linkage
OpCapability Kernel
OpCapability ImageBasic
OpCapability LiteralSampler
OpMemoryModel Physical64 OpenCL
OpEntryPoint Kernel %read_image_test "read_image_test"
OpSource OpenCL_C 102000
%uint = OpTypeInt 32 0
%index_0 = OpConstant %uint 0
%void = OpTypeVoid
%v4uint = OpTypeVector %uint 4
%_ptr_CrossWorkgroup_v4uint = OpTypePointer CrossWorkgroup %v4uint
%image2d_t = OpTypeImage %void 2D 0 0 0 0 Unknown ReadOnly
%7 = OpTypeFunction %void %_ptr_CrossWorkgroup_v4uint %image2d_t
%sampler_t = OpTypeSampler
%sampledimage_t = OpTypeSampledImage %image2d_t
%v2uint = OpTypeVector %uint 2
%float = OpTypeFloat 32
%sampler = OpConstantSampler %sampler_t None 0 Nearest
%coord_0_0 = OpConstantNull %v2uint
%float_0 = OpConstant %float 0
%read_image_test = OpFunction %void None %7
%dst = OpFunctionParameter %_ptr_CrossWorkgroup_v4uint
%image = OpFunctionParameter %image2d_t
%entry = OpLabel
%TempSampledImage = OpSampledImage %sampledimage_t %image %sampler
%call = OpImageSampleExplicitLod %v4uint %TempSampledImage %coord_0_0 Lod|ZeroExtend %float_0
%arrayidx = OpInBoundsPtrAccessChain %_ptr_CrossWorkgroup_v4uint %dst %index_0
OpStore %arrayidx %call Aligned 16
OpReturn
OpFunctionEnd
39 changes: 39 additions & 0 deletions test_conformance/spirv_new/spirv_asm/spv1.4/image_operand_zeroextend.spvasm64
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
; SPIR-V
; Version: 1.4
; Generator: Khronos LLVM/SPIR-V Translator; 14
; Bound: 31
; Schema: 0
OpCapability Addresses
OpCapability Linkage
OpCapability Kernel
OpCapability Int64
OpCapability ImageBasic
OpCapability LiteralSampler
OpMemoryModel Physical64 OpenCL
OpEntryPoint Kernel %read_image_test "read_image_test"
OpSource OpenCL_C 102000
%uint = OpTypeInt 32 0
%ulong = OpTypeInt 64 0
%index_0 = OpConstant %ulong 0
%void = OpTypeVoid
%v4uint = OpTypeVector %uint 4
%_ptr_CrossWorkgroup_v4uint = OpTypePointer CrossWorkgroup %v4uint
%image2d_t = OpTypeImage %void 2D 0 0 0 0 Unknown ReadOnly
%7 = OpTypeFunction %void %_ptr_CrossWorkgroup_v4uint %image2d_t
%sampler_t = OpTypeSampler
%sampledimage_t = OpTypeSampledImage %image2d_t
%v2uint = OpTypeVector %uint 2
%float = OpTypeFloat 32
%sampler = OpConstantSampler %sampler_t None 0 Nearest
%coord_0_0 = OpConstantNull %v2uint
%float_0 = OpConstant %float 0
%read_image_test = OpFunction %void None %7
%dst = OpFunctionParameter %_ptr_CrossWorkgroup_v4uint
%image = OpFunctionParameter %image2d_t
%entry = OpLabel
%TempSampledImage = OpSampledImage %sampledimage_t %image %sampler
%call = OpImageSampleExplicitLod %v4uint %TempSampledImage %coord_0_0 Lod|ZeroExtend %float_0
%arrayidx = OpInBoundsPtrAccessChain %_ptr_CrossWorkgroup_v4uint %dst %index_0
OpStore %arrayidx %call Aligned 16
OpReturn
OpFunctionEnd
43 changes: 43 additions & 0 deletions test_conformance/spirv_new/spirv_asm/spv1.4/loop_control_iterationmultiple.spvasm32
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
; SPIR-V
; Version: 1.4
; Generator: Khronos LLVM/SPIR-V Translator; 14
; Bound: 37
; Schema: 0
OpCapability Addresses
OpCapability Linkage
OpCapability Kernel
OpMemoryModel Physical32 OpenCL
OpEntryPoint Kernel %loop_control_test "loop_control_test"
OpSource OpenCL_C 102000
%uint = OpTypeInt 32 0
%uint_0 = OpConstant %uint 0
%uint_1 = OpConstant %uint 1
%void = OpTypeVoid
%_ptr_CrossWorkgroup_uint = OpTypePointer CrossWorkgroup %uint
%5 = OpTypeFunction %void %_ptr_CrossWorkgroup_uint %uint %uint
%bool = OpTypeBool
%loop_control_test = OpFunction %void None %5
%dst = OpFunctionParameter %_ptr_CrossWorkgroup_uint
%count = OpFunctionParameter %uint
%value = OpFunctionParameter %uint
%entry = OpLabel
OpBranch %for_cond
%for_cond = OpLabel
%sum_0 = OpPhi %uint %uint_0 %entry %add %for_inc
%i_0 = OpPhi %uint %uint_0 %entry %inc %for_inc
%cmp = OpSLessThan %bool %i_0 %count
OpLoopMerge %for_cond_cleanup %for_inc IterationMultiple 2
OpBranchConditional %cmp %for_body %for_cond_cleanup
%for_cond_cleanup = OpLabel
OpBranch %for_end
%for_body = OpLabel
%add = OpIAdd %uint %sum_0 %value
OpBranch %for_inc
%for_inc = OpLabel
%inc = OpIAdd %uint %i_0 %uint_1
OpBranch %for_cond
%for_end = OpLabel
%arrayidx = OpInBoundsPtrAccessChain %_ptr_CrossWorkgroup_uint %dst %uint_0
OpStore %arrayidx %sum_0 Aligned 4
OpReturn
OpFunctionEnd
46 changes: 46 additions & 0 deletions test_conformance/spirv_new/spirv_asm/spv1.4/loop_control_iterationmultiple.spvasm64
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
; SPIR-V
; Version: 1.4
; Generator: Khronos LLVM/SPIR-V Translator; 14
; Bound: 37
; Schema: 0
OpCapability Addresses
OpCapability Linkage
OpCapability Kernel
OpCapability Int64
OpMemoryModel Physical64 OpenCL
OpEntryPoint Kernel %loop_control_test "loop_control_test"
OpSource OpenCL_C 102000
%uint = OpTypeInt 32 0
%ulong = OpTypeInt 64 0
%uint_0 = OpConstant %uint 0
%uint_1 = OpConstant %uint 1
%ulong_0 = OpConstant %ulong 0
%void = OpTypeVoid
%_ptr_CrossWorkgroup_uint = OpTypePointer CrossWorkgroup %uint
%5 = OpTypeFunction %void %_ptr_CrossWorkgroup_uint %uint %uint
%bool = OpTypeBool
%loop_control_test = OpFunction %void None %5
%dst = OpFunctionParameter %_ptr_CrossWorkgroup_uint
%count = OpFunctionParameter %uint
%value = OpFunctionParameter %uint
%entry = OpLabel
OpBranch %for_cond
%for_cond = OpLabel
%sum_0 = OpPhi %uint %uint_0 %entry %add %for_inc
%i_0 = OpPhi %uint %uint_0 %entry %inc %for_inc
%cmp = OpSLessThan %bool %i_0 %count
OpLoopMerge %for_cond_cleanup %for_inc IterationMultiple 2
OpBranchConditional %cmp %for_body %for_cond_cleanup
%for_cond_cleanup = OpLabel
OpBranch %for_end
%for_body = OpLabel
%add = OpIAdd %uint %sum_0 %value
OpBranch %for_inc
%for_inc = OpLabel
%inc = OpIAdd %uint %i_0 %uint_1
OpBranch %for_cond
%for_end = OpLabel
%arrayidx = OpInBoundsPtrAccessChain %_ptr_CrossWorkgroup_uint %dst %ulong_0
OpStore %arrayidx %sum_0 Aligned 4
OpReturn
OpFunctionEnd
43 changes: 43 additions & 0 deletions test_conformance/spirv_new/spirv_asm/spv1.4/loop_control_maxiterations.spvasm32
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
; SPIR-V
; Version: 1.4
; Generator: Khronos LLVM/SPIR-V Translator; 14
; Bound: 37
; Schema: 0
OpCapability Addresses
OpCapability Linkage
OpCapability Kernel
OpMemoryModel Physical32 OpenCL
OpEntryPoint Kernel %loop_control_test "loop_control_test"
OpSource OpenCL_C 102000
%uint = OpTypeInt 32 0
%uint_0 = OpConstant %uint 0
%uint_1 = OpConstant %uint 1
%void = OpTypeVoid
%_ptr_CrossWorkgroup_uint = OpTypePointer CrossWorkgroup %uint
%5 = OpTypeFunction %void %_ptr_CrossWorkgroup_uint %uint %uint
%bool = OpTypeBool
%loop_control_test = OpFunction %void None %5
%dst = OpFunctionParameter %_ptr_CrossWorkgroup_uint
%count = OpFunctionParameter %uint
%value = OpFunctionParameter %uint
%entry = OpLabel
OpBranch %for_cond
%for_cond = OpLabel
%sum_0 = OpPhi %uint %uint_0 %entry %add %for_inc
%i_0 = OpPhi %uint %uint_0 %entry %inc %for_inc
%cmp = OpSLessThan %bool %i_0 %count
OpLoopMerge %for_cond_cleanup %for_inc MaxIterations 16
OpBranchConditional %cmp %for_body %for_cond_cleanup
%for_cond_cleanup = OpLabel
OpBranch %for_end
%for_body = OpLabel
%add = OpIAdd %uint %sum_0 %value
OpBranch %for_inc
%for_inc = OpLabel
%inc = OpIAdd %uint %i_0 %uint_1
OpBranch %for_cond
%for_end = OpLabel
%arrayidx = OpInBoundsPtrAccessChain %_ptr_CrossWorkgroup_uint %dst %uint_0
OpStore %arrayidx %sum_0 Aligned 4
OpReturn
OpFunctionEnd
46 changes: 46 additions & 0 deletions test_conformance/spirv_new/spirv_asm/spv1.4/loop_control_maxiterations.spvasm64
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
; SPIR-V
; Version: 1.4
; Generator: Khronos LLVM/SPIR-V Translator; 14
; Bound: 37
; Schema: 0
OpCapability Addresses
OpCapability Linkage
OpCapability Kernel
OpCapability Int64
OpMemoryModel Physical64 OpenCL
OpEntryPoint Kernel %loop_control_test "loop_control_test"
OpSource OpenCL_C 102000
%uint = OpTypeInt 32 0
%ulong = OpTypeInt 64 0
%uint_0 = OpConstant %uint 0
%uint_1 = OpConstant %uint 1
%ulong_0 = OpConstant %ulong 0
%void = OpTypeVoid
%_ptr_CrossWorkgroup_uint = OpTypePointer CrossWorkgroup %uint
%5 = OpTypeFunction %void %_ptr_CrossWorkgroup_uint %uint %uint
%bool = OpTypeBool
%loop_control_test = OpFunction %void None %5
%dst = OpFunctionParameter %_ptr_CrossWorkgroup_uint
%count = OpFunctionParameter %uint
%value = OpFunctionParameter %uint
%entry = OpLabel
OpBranch %for_cond
%for_cond = OpLabel
%sum_0 = OpPhi %uint %uint_0 %entry %add %for_inc
%i_0 = OpPhi %uint %uint_0 %entry %inc %for_inc
%cmp = OpSLessThan %bool %i_0 %count
OpLoopMerge %for_cond_cleanup %for_inc MaxIterations 16
OpBranchConditional %cmp %for_body %for_cond_cleanup
%for_cond_cleanup = OpLabel
OpBranch %for_end
%for_body = OpLabel
%add = OpIAdd %uint %sum_0 %value
OpBranch %for_inc
%for_inc = OpLabel
%inc = OpIAdd %uint %i_0 %uint_1
OpBranch %for_cond
%for_end = OpLabel
%arrayidx = OpInBoundsPtrAccessChain %_ptr_CrossWorkgroup_uint %dst %ulong_0
OpStore %arrayidx %sum_0 Aligned 4
OpReturn
OpFunctionEnd
Loading
Loading