commit 70651528698b6ffb05c690a717f34f58247e5717
author ziga-lunarg <ziga@lunarg.com> Mon Oct 11 17:23:30 2021 +0200
committer ziga-lunarg <87310389+ziga-lunarg@users.noreply.github.com> Thu Nov 04 16:41:30 2021 +0100
tree 17f239e7f8634d80f9cb6378bf8035196d31eb4d
parent 2ab8c47ee56227650422dcd42475888bdc7215a4

layers: Validate spirv memory scope

layers/core_validation.h

diff --git a/layers/core_validation.h b/layers/core_validation.h
index e052452..e9e77bf 100644
--- a/layers/core_validation.h
+++ b/layers/core_validation.h
@@ -545,6 +545,7 @@
     bool ValidateShaderStageMaxResources(VkShaderStageFlagBits stage, const PIPELINE_STATE* pipeline) const;
     bool ValidateShaderStageGroupNonUniform(SHADER_MODULE_STATE const* src, VkShaderStageFlagBits stage,
                                             spirv_inst_iter& insn) const;
+    bool ValidateMemoryScope(SHADER_MODULE_STATE const* src, const spirv_inst_iter& insn) const;
     bool ValidateWorkgroupSize(SHADER_MODULE_STATE const* src, VkPipelineShaderStageCreateInfo const* pStage,
                                const std::unordered_map<uint32_t, std::vector<uint32_t>>& id_value_map) const;
     bool ValidateCooperativeMatrix(SHADER_MODULE_STATE const* src, VkPipelineShaderStageCreateInfo const* pStage,

layers/shader_validation.cpp

diff --git a/layers/shader_validation.cpp b/layers/shader_validation.cpp
index b9f6c2a..56f5ba7 100644
--- a/layers/shader_validation.cpp
+++ b/layers/shader_validation.cpp
@@ -669,6 +669,37 @@
     return skip;
 }
 
+bool CoreChecks::ValidateMemoryScope(SHADER_MODULE_STATE const *src, const spirv_inst_iter &insn) const {
+    bool skip = false;
+
+    const auto &entry = MemoryScopeParam(insn.opcode());
+    if (entry > 0) {
+        const uint32_t scope_id = insn.word(entry);
+        if (enabled_features.core12.vulkanMemoryModel && !enabled_features.core12.vulkanMemoryModelDeviceScope) {
+            const auto &iter = src->GetConstantDef(scope_id);
+            if (iter != src->end()) {
+                if (GetConstantValue(iter) == spv::Scope::ScopeDevice) {
+                    skip |= LogError(device, "VUID-RuntimeSpirv-vulkanMemoryModel-06265",
+                                     "VkPhysicalDeviceVulkan12Features::vulkanMemoryModel is enabled and "
+                                     "VkPhysicalDeviceVulkan12Features::vulkanMemoryModelDeviceScope is disabled, but Device "
+                                     "memory scope is used.");
+                }
+            }
+        } else if (!enabled_features.core12.vulkanMemoryModel) {
+            const auto &iter = src->GetConstantDef(scope_id);
+            if (iter != src->end()) {
+                if (GetConstantValue(iter) == spv::Scope::ScopeQueueFamily) {
+                    skip |= LogError(device, "VUID-RuntimeSpirv-vulkanMemoryModel-06266",
+                                     "VkPhysicalDeviceVulkan12Features::vulkanMemoryModel is not enabled, but QueueFamily "
+                                     "memory scope is used.");
+                }
+            }
+        }
+    }
+
+    return skip;
+}
+
 bool CoreChecks::ValidateWorkgroupSize(SHADER_MODULE_STATE const *src, VkPipelineShaderStageCreateInfo const *pStage,
                                        const std::unordered_map<uint32_t, std::vector<uint32_t>>& id_value_map) const {
     bool skip = false;
@@ -2382,6 +2413,7 @@
         skip |= ValidateShaderCapabilitiesAndExtensions(module, insn);
         skip |= ValidateShaderClock(module, insn);
         skip |= ValidateShaderStageGroupNonUniform(module, pStage->stage, insn);
+        skip |= ValidateMemoryScope(module, insn);
         total_shared_size += module->CalcComputeSharedMemory(pStage->stage, insn);
     }