Skip to content

Commit ba37b3b

Browse files
opt: Remove InstDebugPrintfPass (KhronosGroup#5856)
This code was only used by Vulkan-Validation layers and it has now been replaced by code in that repository.
1 parent 14388d7 commit ba37b3b

15 files changed

+0
-2138
lines changed

Android.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,10 +129,8 @@ SPVTOOLS_OPT_SRC_FILES := \
129129
source/opt/inline_pass.cpp \
130130
source/opt/inline_exhaustive_pass.cpp \
131131
source/opt/inline_opaque_pass.cpp \
132-
source/opt/inst_debug_printf_pass.cpp \
133132
source/opt/instruction.cpp \
134133
source/opt/instruction_list.cpp \
135-
source/opt/instrument_pass.cpp \
136134
source/opt/interface_var_sroa.cpp \
137135
source/opt/interp_fixup_pass.cpp \
138136
source/opt/invocation_interlock_placement_pass.cpp \

BUILD.bazel

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,6 @@ cc_library(
178178
cc_library(
179179
name = "spirv_tools_opt",
180180
hdrs = [
181-
"include/spirv-tools/instrument.hpp",
182181
"include/spirv-tools/optimizer.hpp",
183182
],
184183
copts = COMMON_COPTS,
@@ -196,7 +195,6 @@ cc_library(
196195
":gen_vendor_tables_spv_amd_shader_ballot",
197196
],
198197
hdrs = glob(["source/opt/*.h"]) + [
199-
"include/spirv-tools/instrument.hpp",
200198
"include/spirv-tools/optimizer.hpp",
201199
],
202200
copts = COMMON_COPTS,

BUILD.gn

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,6 @@ config("spvtools_internal_config") {
388388

389389
source_set("spvtools_headers") {
390390
sources = [
391-
"include/spirv-tools/instrument.hpp",
392391
"include/spirv-tools/libspirv.h",
393392
"include/spirv-tools/libspirv.hpp",
394393
"include/spirv-tools/linker.hpp",
@@ -683,14 +682,10 @@ static_library("spvtools_opt") {
683682
"source/opt/inline_opaque_pass.h",
684683
"source/opt/inline_pass.cpp",
685684
"source/opt/inline_pass.h",
686-
"source/opt/inst_debug_printf_pass.cpp",
687-
"source/opt/inst_debug_printf_pass.h",
688685
"source/opt/instruction.cpp",
689686
"source/opt/instruction.h",
690687
"source/opt/instruction_list.cpp",
691688
"source/opt/instruction_list.h",
692-
"source/opt/instrument_pass.cpp",
693-
"source/opt/instrument_pass.h",
694689
"source/opt/interface_var_sroa.cpp",
695690
"source/opt/interface_var_sroa.h",
696691
"source/opt/interp_fixup_pass.cpp",

CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,6 @@ if(ENABLE_SPIRV_TOOLS_INSTALL)
371371
${CMAKE_CURRENT_SOURCE_DIR}/include/spirv-tools/libspirv.hpp
372372
${CMAKE_CURRENT_SOURCE_DIR}/include/spirv-tools/optimizer.hpp
373373
${CMAKE_CURRENT_SOURCE_DIR}/include/spirv-tools/linker.hpp
374-
${CMAKE_CURRENT_SOURCE_DIR}/include/spirv-tools/instrument.hpp
375374
DESTINATION
376375
${CMAKE_INSTALL_INCLUDEDIR}/spirv-tools/)
377376
endif(ENABLE_SPIRV_TOOLS_INSTALL)

include/spirv-tools/instrument.hpp

Lines changed: 0 additions & 79 deletions
This file was deleted.

include/spirv-tools/optimizer.hpp

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -747,18 +747,6 @@ Optimizer::PassToken CreateReduceLoadSizePass(
747747
// them into a single instruction where possible.
748748
Optimizer::PassToken CreateCombineAccessChainsPass();
749749

750-
// Create a pass to instrument OpDebugPrintf instructions.
751-
// This pass replaces all OpDebugPrintf instructions with instructions to write
752-
// a record containing the string id and the all specified values into a special
753-
// printf output buffer (if space allows). This pass is designed to support
754-
// the printf validation in the Vulkan validation layers.
755-
//
756-
// The instrumentation will write buffers in debug descriptor set |desc_set|.
757-
// It will write |shader_id| in each output record to identify the shader
758-
// module which generated the record.
759-
Optimizer::PassToken CreateInstDebugPrintfPass(uint32_t desc_set,
760-
uint32_t shader_id);
761-
762750
// Create a pass to upgrade to the VulkanKHR memory model.
763751
// This pass upgrades the Logical GLSL450 memory model to Logical VulkanKHR.
764752
// Additionally, it modifies memory, image, atomic and barrier operations to

source/opt/CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,8 @@ set(SPIRV_TOOLS_OPT_SOURCES
6464
inline_exhaustive_pass.h
6565
inline_opaque_pass.h
6666
inline_pass.h
67-
inst_debug_printf_pass.h
6867
instruction.h
6968
instruction_list.h
70-
instrument_pass.h
7169
interface_var_sroa.h
7270
invocation_interlock_placement_pass.h
7371
interp_fixup_pass.h
@@ -185,10 +183,8 @@ set(SPIRV_TOOLS_OPT_SOURCES
185183
inline_exhaustive_pass.cpp
186184
inline_opaque_pass.cpp
187185
inline_pass.cpp
188-
inst_debug_printf_pass.cpp
189186
instruction.cpp
190187
instruction_list.cpp
191-
instrument_pass.cpp
192188
interface_var_sroa.cpp
193189
invocation_interlock_placement_pass.cpp
194190
interp_fixup_pass.cpp

0 commit comments

Comments
 (0)