mirror of
https://github.com/KhronosGroup/SPIRV-Tools
synced 2024-11-24 12:30:13 +00:00
56d0f50357
Based on the OpLine spec, an OpLine instruction must be applied to the instructions physically following it up to the first occurrence of the next end of block, the next OpLine instruction, or the next OpNoLine instruction. ``` OpLine %file 0 0 OpNoLine OpLine %file 1 1 OpStore %foo %int_1 %value = OpLoad %int %foo OpLine %file 2 2 ``` For the above code, the current spirv-opt keeps three line instructions `OpLine %file 0 0`, `OpNoLine`, and `OpLine %file 1 1` in `std::vector<Instruction> dbg_line_insts_` of Instruction class for `OpStore %foo %int_1`. It does not put any line instruction to `std::vector<Instruction> dbg_line_insts_` of `%value = OpLoad %int %foo` even though `OpLine %file 1 1` must be applied to `%value = OpLoad %int %foo` based on the spec. This results in the missing line information for `%value = OpLoad %int %foo` while each spirv-opt pass optimizes the code. We have to put `OpLine %file 1 1` to `std::vector<Instruction> dbg_line_insts_` of both `%value = OpLoad %int %foo` and `OpStore %foo %int_1`. This commit conducts the line instruction propagation and skips emitting the eliminated line instructions at the end, which are the same with PropagateLineInfoPass and RedundantLineInfoElimPass. This commit removes PropagateLineInfoPass and RedundantLineInfoElimPass. KhronosGroup/glslang#2440 is a related PR that stop using PropagateLineInfoPass and RedundantLineInfoElimPass from glslang. When the code in this PR applied, the glslang tests will pass.
109 lines
3.5 KiB
CMake
109 lines
3.5 KiB
CMake
# Copyright (c) 2016 Google Inc.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
add_subdirectory(dominator_tree)
|
|
add_subdirectory(loop_optimizations)
|
|
|
|
add_spvtools_unittest(TARGET opt
|
|
SRCS aggressive_dead_code_elim_test.cpp
|
|
amd_ext_to_khr.cpp
|
|
assembly_builder_test.cpp
|
|
block_merge_test.cpp
|
|
ccp_test.cpp
|
|
cfg_cleanup_test.cpp
|
|
cfg_test.cpp
|
|
code_sink_test.cpp
|
|
combine_access_chains_test.cpp
|
|
compact_ids_test.cpp
|
|
constants_test.cpp
|
|
constant_manager_test.cpp
|
|
convert_relaxed_to_half_test.cpp
|
|
copy_prop_array_test.cpp
|
|
dead_branch_elim_test.cpp
|
|
dead_insert_elim_test.cpp
|
|
dead_variable_elim_test.cpp
|
|
debug_info_manager_test.cpp
|
|
decompose_initialized_variables_test.cpp
|
|
decoration_manager_test.cpp
|
|
def_use_test.cpp
|
|
desc_sroa_test.cpp
|
|
eliminate_dead_const_test.cpp
|
|
eliminate_dead_functions_test.cpp
|
|
eliminate_dead_member_test.cpp
|
|
feature_manager_test.cpp
|
|
fix_storage_class_test.cpp
|
|
flatten_decoration_test.cpp
|
|
fold_spec_const_op_composite_test.cpp
|
|
fold_test.cpp
|
|
freeze_spec_const_test.cpp
|
|
function_test.cpp
|
|
generate_webgpu_initializers_test.cpp
|
|
graphics_robust_access_test.cpp
|
|
if_conversion_test.cpp
|
|
inline_opaque_test.cpp
|
|
inline_test.cpp
|
|
insert_extract_elim_test.cpp
|
|
inst_bindless_check_test.cpp
|
|
inst_buff_addr_check_test.cpp
|
|
inst_debug_printf_test.cpp
|
|
instruction_list_test.cpp
|
|
instruction_test.cpp
|
|
ir_builder.cpp
|
|
ir_context_test.cpp
|
|
ir_loader_test.cpp
|
|
iterator_test.cpp
|
|
legalize_vector_shuffle_test.cpp
|
|
line_debug_info_test.cpp
|
|
local_access_chain_convert_test.cpp
|
|
local_redundancy_elimination_test.cpp
|
|
local_single_block_elim.cpp
|
|
local_single_store_elim_test.cpp
|
|
local_ssa_elim_test.cpp
|
|
module_test.cpp
|
|
module_utils.h
|
|
optimizer_test.cpp
|
|
pass_manager_test.cpp
|
|
pass_merge_return_test.cpp
|
|
pass_remove_duplicates_test.cpp
|
|
pass_utils.cpp
|
|
private_to_local_test.cpp
|
|
propagator_test.cpp
|
|
reduce_load_size_test.cpp
|
|
redundancy_elimination_test.cpp
|
|
register_liveness.cpp
|
|
relax_float_ops_test.cpp
|
|
replace_invalid_opc_test.cpp
|
|
scalar_analysis.cpp
|
|
scalar_replacement_test.cpp
|
|
set_spec_const_default_value_test.cpp
|
|
simplification_test.cpp
|
|
split_invalid_unreachable_test.cpp
|
|
strength_reduction_test.cpp
|
|
strip_atomic_counter_memory_test.cpp
|
|
strip_debug_info_test.cpp
|
|
strip_reflect_info_test.cpp
|
|
struct_cfg_analysis_test.cpp
|
|
type_manager_test.cpp
|
|
types_test.cpp
|
|
unify_const_test.cpp
|
|
upgrade_memory_model_test.cpp
|
|
utils_test.cpp pass_utils.cpp
|
|
value_table_test.cpp
|
|
vector_dce_test.cpp
|
|
workaround1209_test.cpp
|
|
wrap_opkill_test.cpp
|
|
LIBS SPIRV-Tools-opt
|
|
PCH_FILE pch_test_opt
|
|
)
|