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.

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

update tests for disassembly changes #5694

Merged
merged 2 commits into from
Jun 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ vars = {

're2_revision': '917047f3606d3ba9e2de0d383c3cd80c94ed732c',

'spirv_headers_revision': 'ff2afc3afc48dff4eec2a10f0212402a80708e38',
'spirv_headers_revision': 'fbf2402969ed9aec34a8f8b4f5afab342319f07b',
}

deps = {
Expand Down
4 changes: 2 additions & 2 deletions source/wasm/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@ build() {
}

if [ ! -d external/spirv-headers ] ; then
echo "Fetching SPIRV-headers"
git clone https://github.com/KhronosGroup/SPIRV-Headers.git external/spirv-headers
echo "Fetching deps"
utils/git-sync-deps
fi

echo Building ${BASH_REMATCH[1]}
Expand Down
6 changes: 3 additions & 3 deletions test/opt/aggressive_dead_code_elim_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7568,7 +7568,7 @@ TEST_F(AggressiveDCETest, PreserveInterface) {
OpExtension "SPV_KHR_ray_tracing"
%1 = OpExtInstImport "GLSL.std.450"
OpMemoryModel Logical GLSL450
OpEntryPoint RayGenerationNV %2 "main" %3 %4
OpEntryPoint RayGenerationKHR %2 "main" %3 %4
OpDecorate %3 Location 0
OpDecorate %4 DescriptorSet 2
OpDecorate %4 Binding 0
Expand All @@ -7577,8 +7577,8 @@ OpDecorate %4 Binding 0
%uint = OpTypeInt 32 0
%uint_0 = OpConstant %uint 0
%float = OpTypeFloat 32
%_ptr_CallableDataNV_float = OpTypePointer CallableDataNV %float
%3 = OpVariable %_ptr_CallableDataNV_float CallableDataNV
%_ptr_CallableDataKHR_float = OpTypePointer CallableDataKHR %float
%3 = OpVariable %_ptr_CallableDataKHR_float CallableDataKHR
%13 = OpTypeAccelerationStructureKHR
%_ptr_UniformConstant_13 = OpTypePointer UniformConstant %13
%4 = OpVariable %_ptr_UniformConstant_13 UniformConstant
Expand Down
6 changes: 3 additions & 3 deletions test/opt/spread_volatile_semantics_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ OpDecorate %images DescriptorSet 0
OpDecorate %images Binding 1
OpDecorate %images NonWritable

; CHECK: OpEntryPoint RayGenerationNV {{%\w+}} "RayGeneration" [[var:%\w+]]
; CHECK: OpEntryPoint RayGenerationKHR {{%\w+}} "RayGeneration" [[var:%\w+]]
; CHECK: OpDecorate [[var]] BuiltIn SubgroupSize
; CHECK: OpDecorate [[var]] Volatile
; CHECK-NOT: OpDecorate {{%\w+}} Volatile
Expand Down Expand Up @@ -397,8 +397,8 @@ OpDecorate %images DescriptorSet 0
OpDecorate %images Binding 1
OpDecorate %images NonWritable

; CHECK: OpEntryPoint RayGenerationNV {{%\w+}} "RayGeneration" [[var:%\w+]]
; CHECK: OpEntryPoint ClosestHitNV {{%\w+}} "ClosestHit" [[var]]
; CHECK: OpEntryPoint RayGenerationKHR {{%\w+}} "RayGeneration" [[var:%\w+]]
; CHECK: OpEntryPoint ClosestHitKHR {{%\w+}} "ClosestHit" [[var]]
; CHECK: OpDecorate [[var]] BuiltIn SubgroupSize
; CHECK: OpDecorate [[var]] Volatile
; CHECK-NOT: OpDecorate {{%\w+}} Volatile
Expand Down