Skip to content
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: 2 additions & 0 deletions source/val/validate_memory.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,8 @@ int MemoryAccessNumWords(uint32_t mask) {
if (mask & uint32_t(spv::MemoryAccessMask::Aligned)) ++result;
if (mask & uint32_t(spv::MemoryAccessMask::MakePointerAvailableKHR)) ++result;
if (mask & uint32_t(spv::MemoryAccessMask::MakePointerVisibleKHR)) ++result;
if (mask & uint32_t(spv::MemoryAccessMask::AliasScopeINTELMask)) ++result;
if (mask & uint32_t(spv::MemoryAccessMask::NoAliasINTELMask)) ++result;
return result;
}

Expand Down
29 changes: 29 additions & 0 deletions test/val/val_memory_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1942,6 +1942,35 @@ OpFunctionEnd
EXPECT_EQ(SPV_SUCCESS, ValidateInstructions(SPV_ENV_VULKAN_1_2));
}

TEST_F(ValidateMemory, CopyMemoryAliasScopeINTELMaskSuccess) {
const std::string body = R"(
OpCapability Shader
OpCapability MemoryAccessAliasingINTEL
OpExtension "SPV_INTEL_memory_access_aliasing"
OpMemoryModel Logical GLSL450
OpEntryPoint Fragment %main "main"
OpExecutionMode %main OriginUpperLeft
%alias_domain = OpAliasDomainDeclINTEL
%alias_scope = OpAliasScopeDeclINTEL %alias_domain
%alias_list = OpAliasScopeListDeclINTEL %alias_scope
%void = OpTypeVoid
%uint = OpTypeInt 32 0
%ptr_uint = OpTypePointer Function %uint
%func_type = OpTypeFunction %void
%main = OpFunction %void None %func_type
%entry = OpLabel
%var1 = OpVariable %ptr_uint Function
%var2 = OpVariable %ptr_uint Function
OpCopyMemory %var1 %var2 Aligned|AliasScopeINTELMask 4 %alias_list
OpCopyMemory %var1 %var2 Aligned|NoAliasINTELMask 4 %alias_list
OpReturn
OpFunctionEnd
)";

CompileSuccessfully(body.c_str());
EXPECT_EQ(SPV_SUCCESS, ValidateInstructions());
}

TEST_F(ValidateMemory, PSBCopyMemoryAlignedMissingTarget) {
const std::string body = R"(
OpCapability PhysicalStorageBufferAddresses
Expand Down
Loading