microsoft · Keenuts · Oct 28, 2024 · Oct 22, 2024 · Oct 24, 2024
diff --git a/external/SPIRV-Tools b/external/SPIRV-Tools
diff --git a/tools/clang/include/clang/SPIRV/SpirvContext.h b/tools/clang/include/clang/SPIRV/SpirvContext.h
@@ -11,6 +11,7 @@
 
 #include <array>
 #include <limits>
+#include <optional>
 
 #include "dxc/DXIL/DxilShaderModel.h"
 #include "clang/AST/DeclTemplate.h"
@@ -138,7 +139,7 @@ struct FunctionTypeMapInfo {
 struct VkImageFeatures {
   // True if it is a Vulkan "Combined Image Sampler".
   bool isCombinedImageSampler;
-  spv::ImageFormat format; // SPIR-V image format.
+  std::optional<spv::ImageFormat> format; // SPIR-V image format.
 };
 
 // A struct that contains the information of a resource that will be used to
@@ -378,7 +379,7 @@ class SpirvContext {
   getVkImageFeaturesForSpirvVariable(const SpirvVariable *spvVar) {
     auto itr = spvVarToVkImageFeatures.find(spvVar);
     if (itr == spvVarToVkImageFeatures.end())
-      return {false, spv::ImageFormat::Unknown};
+      return {false, std::nullopt};
     return itr->second;
   }
 

diff --git a/tools/clang/lib/SPIRV/CapabilityVisitor.cpp b/tools/clang/lib/SPIRV/CapabilityVisitor.cpp
@@ -439,36 +439,13 @@ bool CapabilityVisitor::visit(SpirvImageSparseTexelsResident *instr) {
   return true;
 }
 
-namespace {
-bool isImageOpOnUnknownFormat(const SpirvImageOp *instruction) {
-  if (!instruction->getImage() || !instruction->getImage()->getResultType()) {
-    return false;
-  }
-
-  const ImageType *imageType =
-      dyn_cast<ImageType>(instruction->getImage()->getResultType());
-  if (!imageType || imageType->getImageFormat() != spv::ImageFormat::Unknown) {
-    return false;
-  }
-
-  return imageType->getImageFormat() == spv::ImageFormat::Unknown;
-}
-} // namespace
-
 bool CapabilityVisitor::visit(SpirvImageOp *instr) {
   addCapabilityForType(instr->getResultType(), instr->getSourceLocation(),
                        instr->getStorageClass());
   if (instr->hasOffset() || instr->hasConstOffsets())
     addCapability(spv::Capability::ImageGatherExtended);
   if (instr->isSparse())
     addCapability(spv::Capability::SparseResidency);
-
-  if (isImageOpOnUnknownFormat(instr)) {
-    addCapability(instr->isImageWrite()
-                      ? spv::Capability::StorageImageWriteWithoutFormat
-                      : spv::Capability::StorageImageReadWithoutFormat);
-  }
-
   return true;
 }
 
@@ -864,6 +841,8 @@ bool CapabilityVisitor::visit(SpirvModule *, Visitor::Phase phase) {
   // supports only some capabilities. This list should be expanded to match the
   // supported capabilities.
   addCapability(spv::Capability::MinLod);
+  addCapability(spv::Capability::StorageImageWriteWithoutFormat);
+  addCapability(spv::Capability::StorageImageReadWithoutFormat);
 
   addExtensionAndCapabilitiesIfEnabled(
       Extension::EXT_fragment_shader_interlock,

diff --git a/tools/clang/lib/SPIRV/DeclResultIdMapper.cpp b/tools/clang/lib/SPIRV/DeclResultIdMapper.cpp
@@ -517,9 +517,10 @@ SpirvLayoutRule getLayoutRuleForExternVar(QualType type,
   return SpirvLayoutRule::Void;
 }
 
-spv::ImageFormat getSpvImageFormat(const VKImageFormatAttr *imageFormatAttr) {
+std::optional<spv::ImageFormat>
+getSpvImageFormat(const VKImageFormatAttr *imageFormatAttr) {
   if (imageFormatAttr == nullptr)
-    return spv::ImageFormat::Unknown;
+    return std::nullopt;
 
   switch (imageFormatAttr->getImageFormat()) {
   case VKImageFormatAttr::unknown:
@@ -1235,14 +1236,13 @@ SpirvVariable *DeclResultIdMapper::createExternVar(const VarDecl *var,
   VkImageFeatures vkImgFeatures = {
       var->getAttr<VKCombinedImageSamplerAttr>() != nullptr,
       getSpvImageFormat(var->getAttr<VKImageFormatAttr>())};
-  if (vkImgFeatures.format != spv::ImageFormat::Unknown) {
+  if (vkImgFeatures.format) {
     // Legalization is needed to propagate the correct image type for
     // instructions in addition to cases where the resource is assigned to
     // another variable or function parameter
     needsLegalization = true;
   }
-  if (vkImgFeatures.isCombinedImageSampler ||
-      vkImgFeatures.format != spv::ImageFormat::Unknown) {
+  if (vkImgFeatures.isCombinedImageSampler || vkImgFeatures.format) {
     spvContext.registerVkImageFeaturesForSpvVariable(varInstr, vkImgFeatures);
   }
 
@@ -1256,8 +1256,9 @@ SpirvVariable *DeclResultIdMapper::createExternVar(const VarDecl *var,
   }
 
   if (hlsl::IsHLSLResourceType(type)) {
-    if (!areFormatAndTypeCompatible(vkImgFeatures.format,
-                                    hlsl::GetHLSLResourceResultType(type))) {
+    if (!areFormatAndTypeCompatible(
+            vkImgFeatures.format.value_or(spv::ImageFormat::Unknown),
+            hlsl::GetHLSLResourceResultType(type))) {
       emitError("The image format and the sampled type are not compatible.\n"
                 "For the table of compatible types, see "
                 "https://docs.vulkan.org/spec/latest/appendices/"

diff --git a/tools/clang/lib/SPIRV/LowerTypeVisitor.cpp b/tools/clang/lib/SPIRV/LowerTypeVisitor.cpp
@@ -198,15 +198,17 @@ bool LowerTypeVisitor::visitInstruction(SpirvInstruction *instr) {
       }
 
       auto vkImgFeatures = spvContext.getVkImageFeaturesForSpirvVariable(var);
-      if (vkImgFeatures.format != spv::ImageFormat::Unknown) {
+      if (vkImgFeatures.format) {
         if (const auto *imageType = dyn_cast<ImageType>(resultType)) {
-          resultType = spvContext.getImageType(imageType, vkImgFeatures.format);
+          resultType =
+              spvContext.getImageType(imageType, *vkImgFeatures.format);
           instr->setResultType(resultType);
         } else if (const auto *arrayType = dyn_cast<ArrayType>(resultType)) {
           if (const auto *imageType =
                   dyn_cast<ImageType>(arrayType->getElementType())) {
-            auto newImgType =
-                spvContext.getImageType(imageType, vkImgFeatures.format);
+            auto newImgType = spvContext.getImageType(
+                imageType,
+                vkImgFeatures.format.value_or(spv::ImageFormat::Unknown));
             resultType = spvContext.getArrayType(newImgType,
                                                  arrayType->getElementCount(),
                                                  arrayType->getStride());

diff --git a/tools/clang/test/CodeGenSPIRV/op.buffer.access.hlsl b/tools/clang/test/CodeGenSPIRV/op.buffer.access.hlsl
@@ -1,8 +1,7 @@
 // RUN: %dxc -T ps_6_0 -E main -fcgl  %s -spirv | FileCheck %s
 
 // CHECK: OpCapability ImageBuffer
-// CHECK: OpCapability StorageImageReadWithoutFormat
-
+// CHECK-NOT: OpCapability StorageImageReadWithoutFormat
 
 // CHECK: %type_buffer_image = OpTypeImage %int Buffer 2 0 0 1 R32i
 // CHECK: %type_buffer_image_0 = OpTypeImage %uint Buffer 2 0 0 1 R32ui

diff --git a/tools/clang/test/CodeGenSPIRV/vk.attribute.image-format.unknown.hlsl b/tools/clang/test/CodeGenSPIRV/vk.attribute.image-format.unknown.hlsl
@@ -0,0 +1,14 @@
+// RUN: %dxc -T cs_6_7 -E main -spirv -fspv-target-env=vulkan1.3 %s
+
+// CHECK: OpCapability StorageImageWriteWithoutFormat
+
+// CHECK: %[[#image:]] = OpTypeImage %float 3D 2 0 0 2 Unknown
+[[vk::image_format("unknown")]] RWTexture3D<float32_t2> untypedImage;
+
+[numthreads(8,8,8)]
+void main(uint32_t3 gl_GlobalInvocationID : SV_DispatchThreadID)
+{
+// CHECK: %[[#tmp:]] = OpLoad %[[#image]] %[[#]]
+// CHECK:              OpImageWrite [[#tmp]] %[[#]] %[[#]] None
+    untypedImage[gl_GlobalInvocationID] = float32_t2(4,5);
+}
diff --git a/tools/clang/test/CodeGenSPIRV/vk.attribute.image-format.unknown.read.hlsl b/tools/clang/test/CodeGenSPIRV/vk.attribute.image-format.unknown.read.hlsl
@@ -0,0 +1,16 @@
+// RUN: %dxc -T cs_6_7 -E main -spirv -fspv-target-env=vulkan1.3 %s
+
+// CHECK: OpCapability StorageImageReadWithoutFormat
+
+// CHECK: %[[#image:]] = OpTypeImage %float 1D 2 0 0 2 Unknown
+[[vk::image_format("unknown")]] RWTexture1D<float32_t2> untypedImage;
+RWStructuredBuffer<float32_t2> output;
+
+[numthreads(8,8,8)]
+void main()
+{
+// CHECK: %[[#tmp:]] = OpLoad %[[#image]] %[[#]]
+// CHECK:              OpImageRead %[[#]] [[#tmp]] %[[#]] None
+    output[0] = untypedImage[0];
+}
+
+1 −1		.github/workflows/ios.yml
+0 −2		Android.mk
+0 −2		BUILD.bazel
+0 −5		BUILD.gn
+0 −1		CMakeLists.txt
+0 −79		include/spirv-tools/instrument.hpp
+0 −12		include/spirv-tools/optimizer.hpp
+0 −4		source/opt/CMakeLists.txt
+2 −1		source/opt/aggressive_dead_code_elim_pass.cpp
+0 −484		source/opt/inst_debug_printf_pass.cpp
+0 −198		source/opt/inst_debug_printf_pass.h
+0 −803		source/opt/instrument_pass.cpp
+0 −326		source/opt/instrument_pass.h
+2 −1		source/opt/local_access_chain_convert_pass.cpp
+2 −1		source/opt/local_single_block_elim_pass.cpp
+2 −1		source/opt/local_single_store_elim_pass.cpp
+0 −13		source/opt/optimizer.cpp
+0 −1		source/opt/passes.h
+25 −1		source/opt/trim_capabilities_pass.cpp
+1 −0		source/opt/trim_capabilities_pass.h
+0 −1		test/opt/CMakeLists.txt
+0 −207		test/opt/inst_debug_printf_test.cpp
+88 −0		test/opt/trim_capabilities_pass_test.cpp