From c701ec00ccce6dfa8094d6550ce2db929fc8cefe Mon Sep 17 00:00:00 2001 From: Yong He Date: Tue, 1 Jul 2025 19:09:29 -0700 Subject: Defer immutable buffer loads when emitting spirv. (#7579) * Defer immutable buffer loads when emitting spirv. * Fix. * Fix. * Fix. * Fix tests. * Fix test. --- tests/vkray/callable.slang | 4 ++-- tests/vkray/closesthit.slang | 10 +++++----- tests/vkray/entry-point-params.slang | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'tests/vkray') diff --git a/tests/vkray/callable.slang b/tests/vkray/callable.slang index f3aa55979..51f69ad1c 100644 --- a/tests/vkray/callable.slang +++ b/tests/vkray/callable.slang @@ -22,5 +22,5 @@ void main(in out MaterialPayload ioPayload) // CHECK-DAG: OpTypePointer IncomingCallableData{{NV|KHR}} // CHECK-DAG: OpTypePointer IncomingCallableData{{NV|KHR}} // CHECK-DAG: OpTypePointer IncomingCallableData{{NV|KHR}} -// CHECK-DAG: %{{.*}} = OpAccessChain %{{.*}} %{{.*}} %{{.*}} -// CHECK-DAG: %{{.*}} = OpAccessChain %{{.*}} %{{.*}} %{{.*}} +// CHECK-DAG: %{{.*}} = Op{{.*}}AccessChain %{{.*}} %{{.*}} %{{.*}} +// CHECK-DAG: %{{.*}} = Op{{.*}}AccessChain %{{.*}} %{{.*}} %{{.*}} \ No newline at end of file diff --git a/tests/vkray/closesthit.slang b/tests/vkray/closesthit.slang index b7d40e5f9..9d767ccae 100644 --- a/tests/vkray/closesthit.slang +++ b/tests/vkray/closesthit.slang @@ -56,8 +56,8 @@ void main( // CHECK-DAG: %{{.*}} = OpVariable %_ptr_IncomingRayPayload{{NV|KHR}}_ReflectionRay{{.*}} IncomingRayPayload{{NV|KHR}} // CHECK-DAG: %{{.*}} = OpLoad %{{u?}}int %[[INSTANCE_ID]] // CHECK-DAG: %{{.*}} = OpLoad %{{u?}}int %[[INSTANCE_INDEX]] -// CHECK-DAG: %{{.*}} = OpAccessChain %_ptr_ShaderRecordBuffer{{NV|KHR}}_uint %ShaderRecord{{.*}} %int_0 -// CHECK-DAG: %{{.*}} = OpAccessChain %_ptr_IncomingRayPayload{{NV|KHR}}_v4float %{{.*}} %int_0 -// CHECK-DAG: %{{.*}} = OpAccessChain %_ptr_Input_v3float %{{.*}} %{{u?}}int_0 -// CHECK-DAG: %{{.*}} = OpAccessChain %_ptr_Input_v3float %{{.*}} %{{u?}}int_1 -// CHECK-DAG: %{{.*}} = OpAccessChain %_ptr_Input_v3float %{{.*}} %{{u?}}int_2 +// CHECK-DAG: %{{.*}} = Op{{.*}}AccessChain %_ptr_ShaderRecordBuffer{{NV|KHR}}_uint %ShaderRecord{{.*}} %int_0 +// CHECK-DAG: %{{.*}} = Op{{.*}}AccessChain %_ptr_IncomingRayPayload{{NV|KHR}}_v4float %{{.*}} %int_0 +// CHECK-DAG: %{{.*}} = Op{{.*}}AccessChain %_ptr_Input_v3float %{{.*}} %{{u?}}int_0 +// CHECK-DAG: %{{.*}} = Op{{.*}}AccessChain %_ptr_Input_v3float %{{.*}} %{{u?}}int_1 +// CHECK-DAG: %{{.*}} = Op{{.*}}AccessChain %_ptr_Input_v3float %{{.*}} %{{u?}}int_2 diff --git a/tests/vkray/entry-point-params.slang b/tests/vkray/entry-point-params.slang index e3f29bc5b..47b108414 100644 --- a/tests/vkray/entry-point-params.slang +++ b/tests/vkray/entry-point-params.slang @@ -20,4 +20,4 @@ void main( // CHECK-DAG: OpDecorate %[[LaunchID:[A-Za-z0-9_]+]] BuiltIn LaunchId{{NV|KHR}} // CHECK-DAG: %[[LaunchID]] = OpVariable %_ptr_Input_v3uint Input // CHECK-DAG: %{{.*}} = OpLoad %v3uint %[[LaunchID]] -// CHECK-DAG: %{{.*}} = OpAccessChain %_ptr_ShaderRecordBuffer{{NV|KHR}}_float %{{.*}} %int_0 +// CHECK-DAG: %{{.*}} = Op{{.*}}AccessChain %_ptr_ShaderRecordBuffer{{NV|KHR}}_float %{{.*}} %int_0 -- cgit v1.2.3