[ET-VK][ez] Make pipeline executable properties be controlled by a different macro

ssjia · SS-JIA · commit 47ca509beb92 · 2025-10-21T16:31:47.000-04:00
Pull Request resolved: #15154 Prevent the following validation layer errors when building with VULKAN_DEBUG ``` Validation Error: [ VUID-VkComputePipelineCreateInfo-None-09497 ] | MessageID = 0xde3918a7 vkCreateComputePipelines(): pCreateInfos[0].flags has VkPipelineCreateFlagBits values (VK_PIPELINE_CREATE_CAPTURE_STATISTICS_BIT_KHR|VK_PIPELINE_CREATE_CAPTURE_INTERNAL_REPRESENTATIONS_BIT_KHR) that requires the extensions VK_KHR_pipeline_executable_properties. The Vulkan spec states: If the pNext chain does not include a VkPipelineCreateFlags2CreateInfo structure, flags must be a valid combination of VkPipelineCreateFlagBits values (https://vulkan.lunarg.com/doc/view/1.4.321.0/mac/antora/spec/latest/chapters/pipelines.html#VUID-VkComputePipelineCreateInfo-None-09497) Validation 0 vkCreateComputePipelines(): pCreateInfos[0].flags has VkPipelineCreateFlagBits values (VK_PIPELINE_CREATE_CAPTURE_STATISTICS_BIT_KHR|VK_PIPELINE_CREATE_CAPTURE_INTERNAL_REPRESENTATIONS_BIT_KHR) that requires the extensions VK_KHR_pipeline_executable_properties. The Vulkan spec states: If the pNext chain does not include a VkPipelineCreateFlags2CreateInfo structure, flags must be a valid combination of VkPipelineCreateFlagBits values (https://vulkan.lunarg.com/doc/view/1.4.321.0/mac/antora/spec/latest/chapters/pipelines.html#VUID-VkComputePipelineCreateInfo-None-09497) Validation Error: [ VUID-VkComputePipelineCreateInfo-None-09497 ] | MessageID = 0xde3918a7 vkCreateComputePipelines(): pCreateInfos[0].flags has VkPipelineCreateFlagBits values (VK_PIPELINE_CREATE_CAPTURE_STATISTICS_BIT_KHR|VK_PIPELINE_CREATE_CAPTURE_INTERNAL_REPRESENTATIONS_BIT_KHR) that requires the extensions VK_KHR_pipeline_executable_properties. The Vulkan spec states: If the pNext chain does not include a VkPipelineCreateFlags2CreateInfo structure, flags must be a valid combination of VkPipelineCreateFlagBits values (https://vulkan.lunarg.com/doc/view/1.4.321.0/mac/antora/spec/latest/chapters/pipelines.html#VUID-VkComputePipelineCreateInfo-None-09497) Validation 0 vkCreateComputePipelines(): pCreateInfos[0].flags has VkPipelineCreateFlagBits values (VK_PIPELINE_CREATE_CAPTURE_STATISTICS_BIT_KHR|VK_PIPELINE_CREATE_CAPTURE_INTERNAL_REPRESENTATIONS_BIT_KHR) that requires the extensions VK_KHR_pipeline_executable_properties. The Vulkan spec states: If the pNext chain does not include a VkPipelineCreateFlags2CreateInfo structure, flags must be a valid combination of VkPipelineCreateFlagBits values (https://vulkan.lunarg.com/doc/view/1.4.321.0/mac/antora/spec/latest/chapters/pipelines.html#VUID-VkComputePipelineCreateInfo-None-09497) ``` ghstack-source-id: 317683543 @exported-using-ghexport Differential Revision: [D84716453](https://our.internmc.facebook.com/intern/diff/D84716453/)
diff --git a/backends/vulkan/runtime/api/Context.cpp b/backends/vulkan/runtime/api/Context.cpp
@@ -288,9 +288,8 @@ Context* context() {
   return context.get();
 }
 
-#ifdef VULKAN_DEBUG
-
-#ifdef VK_KHR_pipeline_executable_properties
+#if defined(VK_KHR_pipeline_executable_properties) && \
+    defined(ETVK_INSPECT_PIPELINES)
 
 VkPipeline Context::get_shader_pipeline(
     const vkapi::ShaderInfo& shader,
@@ -502,9 +501,7 @@ void Context::print_shader_executable_properties(
   }
 }
 
-#endif // VK_KHR_pipeline_executable_properties
-
-#endif // VULKAN_DEBUG
+#endif // VK_KHR_pipeline_executable_properties && ETVK_INSPECT_PIPELINES
 
 } // namespace api
 } // namespace vkcompute
diff --git a/backends/vulkan/runtime/api/Context.h b/backends/vulkan/runtime/api/Context.h
@@ -234,9 +234,8 @@ class Context final {
 
   void flush();
 
-#ifdef VULKAN_DEBUG
-
-#ifdef VK_KHR_pipeline_executable_properties
+#if defined(VK_KHR_pipeline_executable_properties) && \
+    defined(ETVK_INSPECT_PIPELINES)
 
   VkPipeline get_shader_pipeline(
       const vkapi::ShaderInfo& shader,
@@ -260,9 +259,7 @@ class Context final {
       const vkapi::ShaderInfo& shader,
       const vkapi::SpecVarList& spec_constants);
 
-#endif // VK_KHR_pipeline_executable_properties
-
-#endif // VULKAN_DEBUG
+#endif // VK_KHR_pipeline_executable_properties && ETVK_INSPECT_PIPELINES
 };
 
 bool available();
diff --git a/backends/vulkan/runtime/vk_api/Adapter.cpp b/backends/vulkan/runtime/vk_api/Adapter.cpp
@@ -113,9 +113,10 @@ VkDevice create_logical_device(
 #ifdef VK_KHR_shader_integer_dot_product
       VK_KHR_SHADER_INTEGER_DOT_PRODUCT_EXTENSION_NAME,
 #endif /* VK_KHR_shader_integer_dot_product */
-#if defined(VK_KHR_pipeline_executable_properties) && defined(VULKAN_DEBUG)
+#if defined(VK_KHR_pipeline_executable_properties) && \
+    defined(ETVK_INSPECT_PIPELINES)
       VK_KHR_PIPELINE_EXECUTABLE_PROPERTIES_EXTENSION_NAME,
-#endif /* VK_KHR_pipeline_executable_properties */
+#endif /* VK_KHR_pipeline_executable_properties && ETVK_INSPECT_PIPELINES */
   };
 
   std::vector<const char*> enabled_device_extensions;
diff --git a/backends/vulkan/runtime/vk_api/Pipeline.cpp b/backends/vulkan/runtime/vk_api/Pipeline.cpp
@@ -298,10 +298,11 @@ ComputePipeline::ComputePipeline(
   };
 
   VkPipelineCreateFlags flags = 0u;
-#if defined(VULKAN_DEBUG) && defined(VK_KHR_pipeline_executable_properties)
+#if defined(VK_KHR_pipeline_executable_properties) && \
+    defined(ETVK_INSPECT_PIPELINES)
   flags = VK_PIPELINE_CREATE_CAPTURE_STATISTICS_BIT_KHR |
       VK_PIPELINE_CREATE_CAPTURE_INTERNAL_REPRESENTATIONS_BIT_KHR | flags;
-#endif /* VULKAN_DEBUG && VK_KHR_pipeline_executable_properties */
+#endif // VK_KHR_pipeline_executable_properties && ETVK_INSPECT_PIPELINES
 
   const VkComputePipelineCreateInfo compute_pipeline_create_info{
       VK_STRUCTURE_TYPE_COMPUTE_PIPELINE_CREATE_INFO, // sType
diff --git a/backends/vulkan/test/vulkan_compute_api_test.cpp b/backends/vulkan/test/vulkan_compute_api_test.cpp
@@ -102,14 +102,15 @@ TEST_F(VulkanComputeAPITest, print_adapter) {
   std::cout << *(context()->adapter_ptr()) << std::endl;
 }
 
-#if defined(VULKAN_DEBUG) && defined(VK_KHR_pipeline_executable_properties)
+#if defined(VK_KHR_pipeline_executable_properties) && \
+    defined(ETVK_INSPECT_PIPELINES)
 
 TEST_F(VulkanComputeAPITest, print_shader_executable_properties) {
   context()->print_shader_executable_properties(
       VK_KERNEL(binary_add_nobroadcast__test_half), {0});
 }
 
-#endif // VULKAN_DEBUG && VK_KHR_pipeline_executable_properties
+#endif // VK_KHR_pipeline_executable_properties && ETVK_INSPECT_PIPELINES
 
 std::vector<int64_t> get_reference_strides(
     const std::vector<int64_t>& sizes,

Original file line number	Diff line number	Diff line change
`@@ -288,9 +288,8 @@ Context* context() {`
`288`	`288`	`return context.get();`
`289`	`289`	`}`
`290`	`290`
`291`		`-#ifdef VULKAN_DEBUG`
`292`		`-`
`293`		`-#ifdef VK_KHR_pipeline_executable_properties`
	`291`	`+#if defined(VK_KHR_pipeline_executable_properties) && \`
	`292`	`+ defined(ETVK_INSPECT_PIPELINES)`
`294`	`293`
`295`	`294`	`VkPipeline Context::get_shader_pipeline(`
`296`	`295`	`const vkapi::ShaderInfo& shader,`
`@@ -502,9 +501,7 @@ void Context::print_shader_executable_properties(`
`502`	`501`	`}`
`503`	`502`	`}`
`504`	`503`
`505`		`-#endif // VK_KHR_pipeline_executable_properties`
`506`		`-`
`507`		`-#endif // VULKAN_DEBUG`
	`504`	`+#endif // VK_KHR_pipeline_executable_properties && ETVK_INSPECT_PIPELINES`
`508`	`505`
`509`	`506`	`} // namespace api`
`510`	`507`	`} // namespace vkcompute`
Original file line number	Diff line number	Diff line change
`@@ -102,14 +102,15 @@ TEST_F(VulkanComputeAPITest, print_adapter) {`
`102`	`102`	`std::cout << *(context()->adapter_ptr()) << std::endl;`
`103`	`103`	`}`
`104`	`104`
`105`		`-#if defined(VULKAN_DEBUG) && defined(VK_KHR_pipeline_executable_properties)`
	`105`	`+#if defined(VK_KHR_pipeline_executable_properties) && \`
	`106`	`+ defined(ETVK_INSPECT_PIPELINES)`
`106`	`107`
`107`	`108`	`TEST_F(VulkanComputeAPITest, print_shader_executable_properties) {`
`108`	`109`	`context()->print_shader_executable_properties(`
`109`	`110`	`VK_KERNEL(binary_add_nobroadcast__test_half), {0});`
`110`	`111`	`}`
`111`	`112`
`112`		`-#endif // VULKAN_DEBUG && VK_KHR_pipeline_executable_properties`
	`113`	`+#endif // VK_KHR_pipeline_executable_properties && ETVK_INSPECT_PIPELINES`
`113`	`114`
`114`	`115`	`std::vector<int64_t> get_reference_strides(`
`115`	`116`	`const std::vector<int64_t>& sizes,`