Non memory object as parameters. (#2415)
In relaxed addressing mode, we want to accept non memory objects
because this is a very natural translation of hlsl. It should be fixed
by legalization by inlining the calls.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a5ecb90..2dc6d3a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -176,7 +176,7 @@
endmacro()
endif()
-find_host_package(PythonInterp)
+find_host_package(PythonInterp 2.7 REQUIRED)
# Check for symbol exports on Linux.
# At the moment, this check will fail on the OSX build machines for the Android NDK.
diff --git a/source/val/validate_function.cpp b/source/val/validate_function.cpp
index 2f485ce..9eebb1c 100644
--- a/source/val/validate_function.cpp
+++ b/source/val/validate_function.cpp
@@ -253,7 +253,8 @@
}
if (_.addressing_model() == SpvAddressingModelLogical) {
- if (parameter_type->opcode() == SpvOpTypePointer) {
+ if (parameter_type->opcode() == SpvOpTypePointer &&
+ !_.options()->relax_logical_pointer) {
SpvStorageClass sc = parameter_type->GetOperandAs<SpvStorageClass>(1u);
// Validate which storage classes can be pointer operands.
switch (sc) {
diff --git a/test/val/val_id_test.cpp b/test/val/val_id_test.cpp
index df177f2..266aaf3 100644
--- a/test/val/val_id_test.cpp
+++ b/test/val/val_id_test.cpp
@@ -2178,6 +2178,47 @@
EXPECT_EQ(SPV_SUCCESS, ValidateInstructions());
}
+TEST_F(ValidateIdWithMessage, OpFunctionWithNonMemoryObject) {
+ // DXC generates code that looks like when given something like:
+ // T t;
+ // t.s.fn_1();
+ // This needs to be accepted before legalization takes place, so we
+ // will include it with the relaxed logical pointer.
+
+ const std::string spirv = R"(
+ OpCapability Shader
+ OpMemoryModel Logical GLSL450
+ OpEntryPoint Vertex %1 "main"
+ OpSource HLSL 600
+ %int = OpTypeInt 32 1
+ %int_0 = OpConstant %int 0
+ %void = OpTypeVoid
+ %9 = OpTypeFunction %void
+ %_struct_5 = OpTypeStruct
+ %_struct_6 = OpTypeStruct %_struct_5
+%_ptr_Function__struct_6 = OpTypePointer Function %_struct_6
+%_ptr_Function__struct_5 = OpTypePointer Function %_struct_5
+ %23 = OpTypeFunction %void %_ptr_Function__struct_5
+ %1 = OpFunction %void None %9
+ %10 = OpLabel
+ %11 = OpVariable %_ptr_Function__struct_6 Function
+ %20 = OpAccessChain %_ptr_Function__struct_5 %11 %int_0
+ %21 = OpFunctionCall %void %12 %20
+ OpReturn
+ OpFunctionEnd
+ %12 = OpFunction %void None %23
+ %13 = OpFunctionParameter %_ptr_Function__struct_5
+ %14 = OpLabel
+ OpReturn
+ OpFunctionEnd
+)";
+
+ auto options = getValidatorOptions();
+ options->relax_logical_pointer = true;
+ CompileSuccessfully(spirv);
+ EXPECT_EQ(SPV_SUCCESS, ValidateInstructions());
+}
+
TEST_F(ValidateIdWithMessage,
OpVariablePointerVariablePointersStorageBufferGood) {
const std::string spirv = R"(
