AuroraMiddleware/SPIRV-Tools
1
0
Fork 0
mirror of https://github.com/KhronosGroup/SPIRV-Tools synced 2024-11-23 12:10:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
83bfdc976a
SPIRV-Tools/Android.mk

343 lines
15 KiB
Makefile
Raw Normal View History

Add Android.mk to SPIRV-Tools Android.mk was migrated from shaderc/third_party. android_test is a stub, only builds spirv-tools libs.h to test build.
2017-10-05 23:07:31 +00:00
LOCAL_PATH := $(call my-dir)
SPVTOOLS_OUT_PATH=$(if $(call host-path-is-absolute,$(TARGET_OUT)),$(TARGET_OUT),$(abspath $(TARGET_OUT)))
[ndk-build] Make SPIRV-Headers location configurable (#2126)
2018-11-28 14:13:38 +00:00
ifeq ($(SPVHEADERS_LOCAL_PATH),)
SPVHEADERS_LOCAL_PATH := $(LOCAL_PATH)/external/spirv-headers
endif
Add Android.mk to SPIRV-Tools Android.mk was migrated from shaderc/third_party. android_test is a stub, only builds spirv-tools libs.h to test build.
2017-10-05 23:07:31 +00:00
SPVTOOLS_SRC_FILES := \
source/assembly_grammar.cpp \
source/binary.cpp \
source/diagnostic.cpp \
source/disassemble.cpp \
source/ext_inst.cpp \
source/enum_string_mapping.cpp \
source/extensions.cpp \
source/id_descriptor.cpp \
source/libspirv.cpp \
source/name_mapper.cpp \
source/opcode.cpp \
source/operand.cpp \
source/parsed_operand.cpp \
source/print.cpp \
source/software_version.cpp \
source/spirv_endian.cpp \
Add option for the max id bound. (#1870) * Create a new entry point for the optimizer Creates a new struct to hold the options for the optimizer, and creates an entry point that take the optimizer options as a parameter. The old entry point that takes validator options are now deprecated. The validator options will be one of the optimizer options. Part of the optimizer options will also be the upper bound on the id bound. * Add a command line option to set the max value for the id bound. The default is 0x3FFFFF. * Modify `TakeNextIdBound` to return 0 when the limit is reached.
2018-09-10 15:49:41 +00:00
source/spirv_optimizer_options.cpp \
Add Android.mk to SPIRV-Tools Android.mk was migrated from shaderc/third_party. android_test is a stub, only builds spirv-tools libs.h to test build.
2017-10-05 23:07:31 +00:00
source/spirv_target_env.cpp \
source/spirv_validator_options.cpp \
source/table.cpp \
source/text.cpp \
source/text_handler.cpp \
Vector DCE (#1512) Introduce a pass that does a DCE type analysis for vector elements instead of the whole vector as a single element. It will then rewrite instructions that are not used with something else. For example, an instruction whose value are not used, even though it is referenced, is replaced with an OpUndef.
2018-04-23 15:13:07 +00:00
source/util/bit_vector.cpp \
Add Android.mk to SPIRV-Tools Android.mk was migrated from shaderc/third_party. android_test is a stub, only builds spirv-tools libs.h to test build.
2017-10-05 23:07:31 +00:00
source/util/parse_number.cpp \
source/util/string_utils.cpp \
Add --time-report to spirv-opt This patch adds a new option --time-report to spirv-opt. For each pass executed by spirv-opt, the flag prints resource utilization for the pass (CPU time, wall time, RSS and page faults) This fixes issue #1378
2018-03-07 14:25:51 +00:00
source/util/timer.cpp \
Add Android.mk to SPIRV-Tools Android.mk was migrated from shaderc/third_party. android_test is a stub, only builds spirv-tools libs.h to test build.
2017-10-05 23:07:31 +00:00
source/val/basic_block.cpp \
source/val/construct.cpp \
source/val/function.cpp \
source/val/instruction.cpp \
source/val/validation_state.cpp \
Move validation files to val/ directory (#1692) This CL moves the various validate files into the val/ directory with the rest of the validation infrastructure. This matches how opt/ is setup with the passes with the infrastructure.
2018-07-11 14:27:34 +00:00
source/val/validate.cpp \
source/val/validate_adjacency.cpp \
Split annotation opcode validation into new file. * Moves annotation opcode checks from idUsage into a new pass * minor style updates
2018-08-08 18:21:27 +00:00
source/val/validate_annotation.cpp \
Move validation files to val/ directory (#1692) This CL moves the various validate files into the val/ directory with the rest of the validation infrastructure. This matches how opt/ is setup with the passes with the infrastructure.
2018-07-11 14:27:34 +00:00
source/val/validate_arithmetics.cpp \
source/val/validate_atomics.cpp \
source/val/validate_barriers.cpp \
source/val/validate_bitwise.cpp \
source/val/validate_builtins.cpp \
source/val/validate_capability.cpp \
source/val/validate_cfg.cpp \
source/val/validate_composites.cpp \
Moving constant opcode validation into a new file * Split constant opcode validation out of idUsage and into validate_constants.cpp * minor style fixes * reduced duplication * fixed an issue with array sizing
2018-08-17 15:20:55 +00:00
source/val/validate_constants.cpp \
Move validation files to val/ directory (#1692) This CL moves the various validate files into the val/ directory with the rest of the validation infrastructure. This matches how opt/ is setup with the passes with the infrastructure.
2018-07-11 14:27:34 +00:00
source/val/validate_conversion.cpp \
source/val/validate_datarules.cpp \
Split debug opcode validation into new file * Removes debug opcode validation from idUsage and puts it in a separate file * minor updates
2018-08-08 17:47:09 +00:00
source/val/validate_debug.cpp \
Move validation files to val/ directory (#1692) This CL moves the various validate files into the val/ directory with the rest of the validation infrastructure. This matches how opt/ is setup with the passes with the infrastructure.
2018-07-11 14:27:34 +00:00
source/val/validate_decorations.cpp \
source/val/validate_derivatives.cpp \
Ensure that imported extended instructions for WebGPU are only "GLSL.std.450" (#2119) Ensure that imported extended instructions for WebGPU are GLSL.std.450 Fixes #2059
2018-11-27 21:20:01 +00:00
source/val/validate_extensions.cpp \
Split function opcode validation into new files. * Moved function opcode validation out of idUsage and into new files * minor style changes * General opcode checking is in validate_function.cpp * Execution limitation checking is in validate_execution_limitations.cpp * Execution limitations was split into a new pass as it requires other validation to register those limitations first.
2018-08-10 13:53:17 +00:00
source/val/validate_execution_limitations.cpp \
source/val/validate_function.cpp \
Move validation files to val/ directory (#1692) This CL moves the various validate files into the val/ directory with the rest of the validation infrastructure. This matches how opt/ is setup with the passes with the infrastructure.
2018-07-11 14:27:34 +00:00
source/val/validate_id.cpp \
source/val/validate_image.cpp \
source/val/validate_interfaces.cpp \
source/val/validate_instruction.cpp \
Move memory class instructions to new pass * Refactored the Memory class of instructions in the spec out Id validation and into a new pass * Tests unmodified * some minor disassembly changes * minor style changes
2018-08-01 18:44:56 +00:00
source/val/validate_memory.cpp \
Merge two implementations of ValidateMemorySemantics (#2175) Fixes #2170
2018-12-06 19:38:15 +00:00
source/val/validate_memory_semantics.cpp \
Split mode setting opcode validation into new file. * Moved mode setting opcode validation out of idUsage and into a new pass * minor style updates
2018-08-08 18:49:59 +00:00
source/val/validate_mode_setting.cpp \
Move validation files to val/ directory (#1692) This CL moves the various validate files into the val/ directory with the rest of the validation infrastructure. This matches how opt/ is setup with the passes with the infrastructure.
2018-07-11 14:27:34 +00:00
source/val/validate_layout.cpp \
source/val/validate_literals.cpp \
source/val/validate_logicals.cpp \
source/val/validate_non_uniform.cpp \
source/val/validate_primitives.cpp \
Merge two implementations of ValidateExecutionScope (#2131)
2018-11-29 18:48:42 +00:00
source/val/validate_scopes.cpp \
Move type instruction validation into separate file * Moved type instruction validation out of validation idUsage into a new file * Consolidate type unique pass into new file * Removed one bad test * Reworked validation ordering
2018-08-03 15:38:51 +00:00
source/val/validate_type.cpp
Add Android.mk to SPIRV-Tools Android.mk was migrated from shaderc/third_party. android_test is a stub, only builds spirv-tools libs.h to test build.
2017-10-05 23:07:31 +00:00
SPVTOOLS_OPT_SRC_FILES := \
source/opt/aggressive_dead_code_elim_pass.cpp \
source/opt/basic_block.cpp \
source/opt/block_merge_pass.cpp \
source/opt/build_module.cpp \
Add a new class opt::CFG to represent the CFG for the module. This class moves some of the CFG-related functionality into a new class opt::CFG. There is some other code related to the CFG in the inliner and in opt::LocalSingleStoreElimPass that should also be moved, but that require more changes than this pure restructuring. I will move those bits in a follow-up PR. Currently, the CFG is computed every time a pass is instantiated, but this should be later moved to the new IRContext class that @s-perron is working on. Other re-factoring: - Add BasicBlock::ContinueBlockIdIfAny. Re-factored out of MergeBlockIdIfAny - Rewrite IsLoopHeader in terms of GetLoopMergeInst. - Run clang-format on some files.
2017-10-30 21:42:26 +00:00
source/opt/cfg.cpp \
CFG cleanup pass - Remove unreachable blocks. - Adds a new pass CFGCleanupPass. This serves as an umbrella pass to remove unnecessary cruft from a CFG. - Currently, the only cleanup operation done is the removal of unreachable basic blocks. - Adds unit tests. - Adds a flag to spirvopt to execute the pass (--cfg-cleanup).
2017-09-06 12:56:41 +00:00
source/opt/cfg_cleanup_pass.cpp \
Implement SSA CCP (SSA Conditional Constant Propagation). This implements the conditional constant propagation pass proposed in Constant propagation with conditional branches, Wegman and Zadeck, ACM TOPLAS 13(2):181-210. The main logic resides in CCPPass::VisitInstruction. Instruction that may produce a constant value are evaluated with the constant folder. If they produce a new constant, the instruction is considered interesting. Otherwise, it's considered varying (for unfoldable instructions) or just not interesting (when not enough operands have a constant value). The other main piece of logic is in CCPPass::VisitBranch. This evaluates the selector of the branch. When it's found to be a known value, it computes the destination basic block and sets it. This tells the propagator which branches to follow. The patch required extensions to the constant manager as well. Instead of hashing the Constant pointers, this patch changes the constant pool to hash the contents of the Constant. This allows the lookups to be done using the actual values of the Constant, preventing duplicate definitions.
2017-12-05 16:39:25 +00:00
source/opt/ccp_pass.cpp \
Transform to combine consecutive access chains * Combines OpAccessChain, OpInBoundsAccessChain, OpPtrAccessChain and OpInBoundsPtrAccessChain * New folding rule to fold add with 0 for integers * Converts to a bitcast if the result type does not match the operand type V
2018-07-23 15:23:11 +00:00
source/opt/combine_access_chains.cpp \
Add folding of OpCompositeExtract and OpConstantComposite constant instructions. Create files for constant folding rules. Add the rules for OpConstantComposite and OpCompositeExtract.
2018-02-08 15:59:03 +00:00
source/opt/common_uniform_elim_pass.cpp \
Add Android.mk to SPIRV-Tools Android.mk was migrated from shaderc/third_party. android_test is a stub, only builds spirv-tools libs.h to test build.
2017-10-05 23:07:31 +00:00
source/opt/compact_ids_pass.cpp \
InsertExtractElim: Split out DeadInsertElim as separate pass
2018-01-27 00:05:33 +00:00
source/opt/composite.cpp \
Add folding of OpCompositeExtract and OpConstantComposite constant instructions. Create files for constant folding rules. Add the rules for OpConstantComposite and OpCompositeExtract.
2018-02-08 15:59:03 +00:00
source/opt/const_folding_rules.cpp \
Add a new constant manager class. This patch adds a new constant manager class to interface with analysis::Constant. The new constant manager lives in ir::IRContext together with the type manager (analysis::TypeManager). The new analysis::ConstantManager is used by the spec constant folder and the constant propagator (in progress). Another cleanup introduced by this patch removes the ID management from the fold spec constant pass, and ir::IRContext and moves it to ir::Module. SSA IDs were maintained by IRContext and Module. That's pointless and leads to mismatch IDs. Fixed by moving all the bookkeeping to ir::Module.
2017-12-07 21:42:27 +00:00
source/opt/constants.cpp \
Copy propagate arrays The sprir-v generated from HLSL code contain many copyies of very large arrays. Not only are these time consumming, but they also cause problems for drivers because they require too much space. To work around this, we will implement an array copy propagation. Note that we will not implement a complete array data flow analysis in order to implement this. We will be looking for very simple cases: 1) The source must never be stored to. 2) The target must be stored to exactly once. 3) The store to the target must be a store to the entire array, and be a copy of the entire source. 4) All loads of the target must be dominated by the store. The hard part is keeping all of the types correct. We do not want to have to do too large a search to update everything, which may not be possible, do we give up if we see any instruction that might be hard to update. Also in types.h, the element decorations are not stored in an std::map. This change was done so the hashing algorithm for a Struct is consistent. With the std::unordered_map, the traversal order was non-deterministic leading to the same type getting hashed to different values. See |Struct::GetExtraHashWords|. Contributes to #1416.
2018-03-21 03:33:24 +00:00
source/opt/copy_prop_arrays.cpp \
Add Android.mk to SPIRV-Tools Android.mk was migrated from shaderc/third_party. android_test is a stub, only builds spirv-tools libs.h to test build.
2017-10-05 23:07:31 +00:00
source/opt/dead_branch_elim_pass.cpp \
InsertExtractElim: Split out DeadInsertElim as separate pass
2018-01-27 00:05:33 +00:00
source/opt/dead_insert_elim_pass.cpp \
Add pass to remove dead variables at the module level. There does not seem to be any pass that remove global variables. I think we could use one. This pass will look specifically for global variables that are not referenced and are not exported. Any decoration associated with the variable will also be removed. However, this could cause types or constants to become unreferenced. They will not be removed. Another pass will have to be called to remove those.
2017-10-20 16:17:41 +00:00
source/opt/dead_variable_elimination.cpp \
Add Android.mk to SPIRV-Tools Android.mk was migrated from shaderc/third_party. android_test is a stub, only builds spirv-tools libs.h to test build.
2017-10-05 23:07:31 +00:00
source/opt/decoration_manager.cpp \
source/opt/def_use_manager.cpp \
Initial implementation of if conversion * Handles simple cases only * Identifies phis in blocks with two predecessors and attempts to convert the phi to an select * does not perform code motion currently so the converted values must dominate the join point (e.g. can't be defined in the branches) * limited for now to two predecessors, but can be extended to handle more cases * Adding if conversion to -O and -Os
2018-01-16 16:15:06 +00:00
source/opt/dominator_analysis.cpp \
Dominator Tree Analysis (#3) Support for dominator and post dominator analysis on ir::Functions. This patch contains a DominatorTree class for building the tree and DominatorAnalysis and DominatorAnalysisPass classes for interfacing and caching the built trees.
2017-11-27 21:21:26 +00:00
source/opt/dominator_tree.cpp \
Add Android.mk to SPIRV-Tools Android.mk was migrated from shaderc/third_party. android_test is a stub, only builds spirv-tools libs.h to test build.
2017-10-05 23:07:31 +00:00
source/opt/eliminate_dead_constant_pass.cpp \
source/opt/eliminate_dead_functions_pass.cpp \
Add scalar replacement Adds a scalar replacement pass. The pass considers all function scope variables of composite type. If there are accesses to individual elements (and it is legal) the pass replaces the variable with a variable for each composite element and updates all the uses. Added the pass to -O Added NumUses and NumUsers to DefUseManager Added some helper methods for the inst to block mapping in context Added some helper methods for specific constant types No longer generate duplicate pointer types. * Now searches for an existing pointer of the appropriate type instead of failing validation * Fixed spec constant extracts * Addressed changes for review * Changed RunSinglePassAndMatch to be able to run validation * current users do not enable it Added handling of acceptable decorations. * Decorations are also transfered where appropriate Refactored extension checking into FeatureManager * Context now owns a feature manager * consciously NOT an analysis * added some test * fixed some minor issues related to decorates * added some decorate related tests for scalar replacement
2017-11-30 22:03:06 +00:00
source/opt/feature_manager.cpp \
Add Android.mk to SPIRV-Tools Android.mk was migrated from shaderc/third_party. android_test is a stub, only builds spirv-tools libs.h to test build.
2017-10-05 23:07:31 +00:00
source/opt/flatten_decoration_pass.cpp \
Android.mk: add source/opt/fold.cpp
2017-10-18 14:28:12 +00:00
source/opt/fold.cpp \
Add general folding infrastructure. Create the folding engine that will 1) attempt to fold an instruction. 2) iterates on the folding so small folding rules can be easily combined. 3) insert new instructions when needed. I've added the minimum number of rules needed to test the features above.
2018-01-24 18:26:33 +00:00
source/opt/folding_rules.cpp \
Add Android.mk to SPIRV-Tools Android.mk was migrated from shaderc/third_party. android_test is a stub, only builds spirv-tools libs.h to test build.
2017-10-05 23:07:31 +00:00
source/opt/fold_spec_constant_op_and_composite_pass.cpp \
source/opt/freeze_spec_constant_value_pass.cpp \
source/opt/function.cpp \
Initial implementation of if conversion * Handles simple cases only * Identifies phis in blocks with two predecessors and attempts to convert the phi to an select * does not perform code motion currently so the converted values must dominate the join point (e.g. can't be defined in the branches) * limited for now to two predecessors, but can be extended to handle more cases * Adding if conversion to -O and -Os
2018-01-16 16:15:06 +00:00
source/opt/if_conversion.cpp \
Add Android.mk to SPIRV-Tools Android.mk was migrated from shaderc/third_party. android_test is a stub, only builds spirv-tools libs.h to test build.
2017-10-05 23:07:31 +00:00
source/opt/inline_pass.cpp \
source/opt/inline_exhaustive_pass.cpp \
source/opt/inline_opaque_pass.cpp \
Add base and core bindless validation instrumentation classes (#2014) * Add base and core bindless validation instrumentation classes * Fix formatting. * Few more formatting fixes * Fix build failure * More build fixes * Need to call non-const functions in order. Specifically, these are functions which call TakeNextId(). These need to be called in a specific order to guarantee that tests which do exact compares will work across all platforms. c++ pretty much does not guarantee order of evaluation of operands, so any such functions need to be called separately in individual statements to guarantee order. * More ordering. * And more ordering. * And more formatting. * Attempt to fix NDK build * Another attempt to address NDK build problem. * One more attempt at NDK build failure * Add instrument.hpp to BUILD.gn * Some name improvement in instrument.hpp * Change all types in instrument.hpp to int. * Improve documentation in instrument.hpp * Format fixes * Comment clean up in instrument.hpp * imageInst -> image_inst * Fix GetLabel() issue.
2018-11-08 18:54:54 +00:00
source/opt/inst_bindless_check_pass.cpp \
Add Android.mk to SPIRV-Tools Android.mk was migrated from shaderc/third_party. android_test is a stub, only builds spirv-tools libs.h to test build.
2017-10-05 23:07:31 +00:00
source/opt/instruction.cpp \
Add instruction_list to Android.mk
2017-10-20 18:38:50 +00:00
source/opt/instruction_list.cpp \
Add base and core bindless validation instrumentation classes (#2014) * Add base and core bindless validation instrumentation classes * Fix formatting. * Few more formatting fixes * Fix build failure * More build fixes * Need to call non-const functions in order. Specifically, these are functions which call TakeNextId(). These need to be called in a specific order to guarantee that tests which do exact compares will work across all platforms. c++ pretty much does not guarantee order of evaluation of operands, so any such functions need to be called separately in individual statements to guarantee order. * More ordering. * And more ordering. * And more formatting. * Attempt to fix NDK build * Another attempt to address NDK build problem. * One more attempt at NDK build failure * Add instrument.hpp to BUILD.gn * Some name improvement in instrument.hpp * Change all types in instrument.hpp to int. * Improve documentation in instrument.hpp * Format fixes * Comment clean up in instrument.hpp * imageInst -> image_inst * Fix GetLabel() issue.
2018-11-08 18:54:54 +00:00
source/opt/instrument_pass.cpp \
Add the IRContext (part 2): Add def-use manager This change will move the instances of the def-use manager to the IRContext. This allows it to persists across optimization, and does not have to be rebuilt multiple times. Added test to ensure that the IRContext is validating and invalidating the analyses correctly.
2017-11-02 18:25:48 +00:00
source/opt/ir_context.cpp \
Add Android.mk to SPIRV-Tools Android.mk was migrated from shaderc/third_party. android_test is a stub, only builds spirv-tools libs.h to test build.
2017-10-05 23:07:31 +00:00
source/opt/ir_loader.cpp \
Loop invariant code motion initial implementation
2018-01-29 10:39:55 +00:00
source/opt/licm_pass.cpp \
Add Android.mk to SPIRV-Tools Android.mk was migrated from shaderc/third_party. android_test is a stub, only builds spirv-tools libs.h to test build.
2017-10-05 23:07:31 +00:00
source/opt/local_access_chain_convert_pass.cpp \
Create a local value numbering pass Creates a pass that removes redundant instructions within the same basic block. This will be implemented using a hash based value numbering algorithm. Added a number of functions that check for the Vulkan descriptor types. These are used to determine if we are variables are read-only or not. Implemented a function to check if loads and variables are read-only. Implemented kernel specific and shader specific versions. A big change is that the Combinator analysis in ADCE is factored out into the IRContext as an analysis. This was done because it is being reused in the value number table.
2017-11-11 01:26:55 +00:00
source/opt/local_redundancy_elimination.cpp \
Add Android.mk to SPIRV-Tools Android.mk was migrated from shaderc/third_party. android_test is a stub, only builds spirv-tools libs.h to test build.
2017-10-05 23:07:31 +00:00
source/opt/local_single_block_elim_pass.cpp \
source/opt/local_single_store_elim_pass.cpp \
source/opt/local_ssa_elim_pass.cpp \
ZIV and SIV loop dependence analysis. Provides functionality to perform ZIV and SIV dependency analysis tests between a load and store within the same loop. Dependency tests rely on scalar analysis to prove and disprove dependencies with regard to the loop being analysed. Based on the 1990 paper Practical Dependence Testing by Goff, Kennedy, Tseng Adds support for marking loops in the loop nest as IRRELEVANT. Loops are marked IRRELEVANT if the analysed instructions contain no induction variables for the loops, i.e. the loops induction variable is not relevent to the dependence of the store and load.
2018-03-29 12:39:54 +00:00
source/opt/loop_dependence.cpp \
source/opt/loop_dependence_helpers.cpp \
Add loop descriptors and some required dominator tree extensions. Add post-order tree iterator. Add DominatorTreeNode extensions: - Add begin/end methods to do pre-order and post-order tree traversal from a given DominatorTreeNode Add DominatorTree extensions: - Add begin/end methods to do pre-order and post-order tree traversal - Tree traversal ignore by default the pseudo entry block - Retrieve a DominatorTreeNode from a basic block Add loop descriptor: - Add a LoopDescriptor class to register all loops in a given function. - Add a Loop class to describe a loop: - Loop parent - Nested loops - Loop depth - Loop header, merge, continue and preheader - Basic blocks that belong to the loop Correct a bug that forced dominator tree to be constantly rebuilt.
2017-12-21 14:47:25 +00:00
source/opt/loop_descriptor.cpp \
Support loop fission. Adds support for spliting loops whose register pressure exceeds a user provided level. This pass will split a loop into two or more loops given that the loop is a top level loop and that spliting the loop is legal. Control flow is left intact for dead code elimination to remove. This pass is enabled with the --loop-fission flag to spirv-opt.
2018-04-23 20:01:12 +00:00
source/opt/loop_fission.cpp \
Add a loop fusion pass. This pass will look for adjacent loops that are compatible and legal to be fused. Loops are compatible if: - they both have one induction variable - they have the same upper and lower bounds - same initial value - same condition - they have the same update step - they are adjacent - there are no break/continue in either of them Fusion is legal if: - fused loops do not have any dependencies with dependence distance greater than 0 that did not exist in the original loops. - there are no function calls in the loops (could have side-effects) - there are no barriers in the loops It will fuse all such loops as long as the number of registers used for the fused loop stays under the threshold defined by max_registers_per_loop.
2018-04-20 14:14:45 +00:00
source/opt/loop_fusion.cpp \
source/opt/loop_fusion_pass.cpp \
Add loop peeling utility The loop peeler util takes a loop as input and create a new one before. The iterator of the duplicated loop then set to accommodate the number of iteration required for the peeling. The loop peeling pass that decided to do the peeling and profitability analysis is left for a follow-up PR.
2018-03-07 18:21:11 +00:00
source/opt/loop_peeling.cpp \
Initial support for loop unrolling. This patch adds initial support for loop unrolling in the form of a series of utility classes which perform the unrolling. The pass can be run with the command spirv-opt --loop-unroll. This will unroll loops within the module which have the unroll hint set. The unroller imposes a number of requirements on the loops it can unroll. These are documented in the comments for the LoopUtils::CanPerformUnroll method in loop_utils.h. Some of the restrictions will be lifted in future patches.
2018-02-14 17:03:12 +00:00
source/opt/loop_unroller.cpp \
Add loop unswitch pass. It moves all conditional branching and switch whose conditions are loop invariant and uniform. Before performing the loop unswitch we check that the loop does not contain any instruction that would prevent it (barriers, group instructions etc.).
2018-02-12 21:42:15 +00:00
source/opt/loop_unswitch_pass.cpp \
source/opt/loop_utils.cpp \
Add Android.mk to SPIRV-Tools Android.mk was migrated from shaderc/third_party. android_test is a stub, only builds spirv-tools libs.h to test build.
2017-10-05 23:07:31 +00:00
source/opt/mem_pass.cpp \
Create a local value numbering pass Creates a pass that removes redundant instructions within the same basic block. This will be implemented using a hash based value numbering algorithm. Added a number of functions that check for the Vulkan descriptor types. These are used to determine if we are variables are read-only or not. Implemented a function to check if loads and variables are read-only. Implemented kernel specific and shader specific versions. A big change is that the Combinator analysis in ADCE is factored out into the IRContext as an analysis. This was done because it is being reused in the value number table.
2017-11-11 01:26:55 +00:00
source/opt/merge_return_pass.cpp \
Add Android.mk to SPIRV-Tools Android.mk was migrated from shaderc/third_party. android_test is a stub, only builds spirv-tools libs.h to test build.
2017-10-05 23:07:31 +00:00
source/opt/module.cpp \
source/opt/optimizer.cpp \
source/opt/pass.cpp \
source/opt/pass_manager.cpp \
Convert private variables to function scope. When a private variable is used in a single function, it can be converted to a function scope variable in that function. This adds a pass that does that. The pass can be enabled using the option `--private-to-local`. This transformation allows other transformations to act on these variables. Also moved `FindPointerToType` from the inline class to the type manager.
2017-12-11 18:10:24 +00:00
source/opt/private_to_local_pass.cpp \
Add passes to propagate and eliminate redundant line instructions (#2027). (#2039) These are bookend passes designed to help preserve line information across passes which delete, move and clone instructions. The propagation pass attaches a debug line instruction to every instruction based on SPIR-V line propagation rules. It should be performed before optimization. The redundant line elimination pass eliminates all line instructions which match the previous line instruction. This pass should be performed at the end of optimization to reduce physical SPIR-V file size. Fixes #2027.
2018-11-15 19:06:17 +00:00
source/opt/process_lines_pass.cpp \
Generic value propagation engine. This class implements a generic value propagation algorithm based on the conditional constant propagation algorithm proposed in Constant propagation with conditional branches, Wegman and Zadeck, ACM TOPLAS 13(2):181-210. The implementation is based on A Propagation Engine for GCC Diego Novillo, GCC Summit 2005 http://ols.fedoraproject.org/GCC/Reprints-2005/novillo-Reprint.pdf The purpose of this implementation is to act as a common framework for any transformation that needs to propagate values from statements producing new values to statements using those values.
2017-11-17 13:59:25 +00:00
source/opt/propagator.cpp \
Add pass to fold a load feeding an extract. We have already disabled common uniform elimination because it created sequences of loads an entire uniform object, then we extract just a single element. This caused problems in some drivers, and is just generally slow because it loads more memory than needed. However, there are other way to get into this situation, so I've added a pass that looks specifically for this pattern and removes it when only a portion of the load is used. Fixes #1547.
2018-05-07 16:31:03 +00:00
source/opt/reduce_load_size.cpp \
Add global redundancy elimination Adds a pass that looks for redundant instruction in a function, and removes them. The algorithm is a hash table based value numbering algorithm that traverses the dominator tree. This pass removes completely redundant instructions, not partially redundant ones.
2017-12-04 17:29:51 +00:00
source/opt/redundancy_elimination.cpp \
Add register liveness analysis. For each function, the analysis determine which SSA registers are live at the beginning of each basic block and which one are killed at the end of the basic block. It also includes utilities to simulate the register pressure for loop fusion and fission. The implementation is based on the paper "A non-iterative data-flow algorithm for computing liveness sets in strict ssa programs" from Boissinot et al.
2018-04-17 14:31:09 +00:00
source/opt/register_pressure.cpp \
Add Android.mk to SPIRV-Tools Android.mk was migrated from shaderc/third_party. android_test is a stub, only builds spirv-tools libs.h to test build.
2017-10-05 23:07:31 +00:00
source/opt/remove_duplicates_pass.cpp \
Add pass to reaplce invalid opcodes Creates a pass that will remove instructions that are invalid for the current shader stage. For the instruction to be considered for replacement 1) The opcode must be valid for a shader modules. 2) The opcode must be invalid for the current shader stage. 3) All entry points to the module must be for the same shader stage. 4) The function containing the instruction must be reachable from an entry point. Fixes #1247.
2018-01-30 16:24:03 +00:00
source/opt/replace_invalid_opc.cpp \
Initial patch for scalar evolution analysis This patch adds support for the analysis of scalars in loops. It works by traversing the defuse chain to build a DAG of scalar operations and then simplifies the DAG by folding constants and grouping like terms. It represents induction variables as recurrent expressions with respect to a given loop and can simplify DAGs containing recurrent expression by rewritting the entire DAG to be a recurrent expression with respect to the same loop.
2018-03-28 13:19:55 +00:00
source/opt/scalar_analysis.cpp \
source/opt/scalar_analysis_simplification.cpp \
Add scalar replacement Adds a scalar replacement pass. The pass considers all function scope variables of composite type. If there are accesses to individual elements (and it is legal) the pass replaces the variable with a variable for each composite element and updates all the uses. Added the pass to -O Added NumUses and NumUsers to DefUseManager Added some helper methods for the inst to block mapping in context Added some helper methods for specific constant types No longer generate duplicate pointer types. * Now searches for an existing pointer of the appropriate type instead of failing validation * Fixed spec constant extracts * Addressed changes for review * Changed RunSinglePassAndMatch to be able to run validation * current users do not enable it Added handling of acceptable decorations. * Decorations are also transfered where appropriate Refactored extension checking into FeatureManager * Context now owns a feature manager * consciously NOT an analysis * added some test * fixed some minor issues related to decorates * added some decorate related tests for scalar replacement
2017-11-30 22:03:06 +00:00
source/opt/scalar_replacement_pass.cpp \
Add Android.mk to SPIRV-Tools Android.mk was migrated from shaderc/third_party. android_test is a stub, only builds spirv-tools libs.h to test build.
2017-10-05 23:07:31 +00:00
source/opt/set_spec_constant_default_value_pass.cpp \
Make use of the instruction folder. Implementation of the simplification pass. - Create pass that calls the instruction folder on each instruction and propagate instructions that fold to a copy. This will do copy propagation as well. - Did not use the propagator engine because I want to modify the instruction as we go along. - Change folding to not allocate new instructions, but make changes in place. This change had a big impact on compile time. - Add simplification pass to the legalization passes in place of insert-extract elimination. - Added test cases for new folding rules. - Added tests for the simplification pass - Added a method to the CFG to apply a function to the basic blocks in reverse post order. Contributes to #1164.
2018-02-02 16:55:05 +00:00
source/opt/simplification_pass.cpp \
SSA rewrite pass. This pass replaces the load/store elimination passes. It implements the SSA re-writing algorithm proposed in Simple and Efficient Construction of Static Single Assignment Form. Braun M., Buchwald S., Hack S., Leißa R., Mallon C., Zwinkau A. (2013) In: Jhala R., De Bosschere K. (eds) Compiler Construction. CC 2013. Lecture Notes in Computer Science, vol 7791. Springer, Berlin, Heidelberg https://link.springer.com/chapter/10.1007/978-3-642-37051-9_6 In contrast to common eager algorithms based on dominance and dominance frontier information, this algorithm works backwards from load operations. When a target variable is loaded, it queries the variable's reaching definition. If the reaching definition is unknown at the current location, it searches backwards in the CFG, inserting Phi instructions at join points in the CFG along the way until it finds the desired store instruction. The algorithm avoids repeated lookups using memoization. For reducible CFGs, which are a superset of the structured CFGs in SPIRV, this algorithm is proven to produce minimal SSA. That is, it inserts the minimal number of Phi instructions required to ensure the SSA property, but some Phi instructions may be dead (https://en.wikipedia.org/wiki/Static_single_assignment_form).
2018-02-22 21:18:29 +00:00
source/opt/ssa_rewrite_pass.cpp \
Add Android.mk to SPIRV-Tools Android.mk was migrated from shaderc/third_party. android_test is a stub, only builds spirv-tools libs.h to test build.
2017-10-05 23:07:31 +00:00
source/opt/strength_reduction_pass.cpp \
source/opt/strip_debug_info_pass.cpp \
Add --strip-reflect pass Strips reflection info. This is limited to decorations and decoration instructions related to the SPV_GOOGLE_hlsl_functionality1 extension. It will remove the OpExtension for SPV_GOOGLE_hlsl_functionality1. It will also remove the OpExtension for SPV_GOOGLE_decorate_string if there are no further remaining uses of OpDecorateStringGOOGLE. Fixes https://github.com/KhronosGroup/SPIRV-Tools/issues/1398
2018-03-09 21:08:57 +00:00
source/opt/strip_reflect_info_pass.cpp \
Fix infinite loop in dead-branch-elimination (#1891) * Create structed cfg analysis. There are lots of optimization that have to traverse the CFG in a structured order just because it wants to know which constructs a basic block in contained in. This adds extra complexity to these optimizations, for causes too much refactoring of older optimizations. To help with this problem, I have written an analysis that can give this information. * Identify branches breaking from loops. Dead branch elimination does a search for a conditional branch to the end of the current selection construct. This search assumes that the only way to leave the construct is through the merge node. But that is not true. The code can jump to the merge node of a loop that contains the construct. The search needs to take this into consideration.
2018-09-17 17:00:24 +00:00
source/opt/struct_cfg_analysis.cpp \
Add Android.mk to SPIRV-Tools Android.mk was migrated from shaderc/third_party. android_test is a stub, only builds spirv-tools libs.h to test build.
2017-10-05 23:07:31 +00:00
source/opt/type_manager.cpp \
source/opt/types.cpp \
Initial implementation of merge return pass. Works with current DefUseManager infrastructure. Added merge return to the standard opts. Added validation to passes. Disabled pass for shader capabilty.
2017-11-08 21:22:10 +00:00
source/opt/unify_const_pass.cpp \
Update memory model (#1904) Upgrade to VulkanKHR memory model * Converts Logical GLSL450 memory model to Logical VulkanKHR * Adds extension and capability * Removes deprecated decorations and replaces them with appropriate flags on downstream instructions * Support for Workgroup upgrades * Support for copy memory * Adding support for image functions * Adding barrier upgrades and tests * Use QueueFamilyKHR scope instead of device
2018-11-30 19:15:51 +00:00
source/opt/upgrade_memory_model.cpp \
Create a pass to work around a driver bug related to OpUnreachable. We have come across a driver bug where and OpUnreachable inside a loop is causing the shader to go into an infinite loop. This commit will try to avoid this bug by turning OpUnreachable instructions that are contained in a loop into branches to the loop merge block. This is not added to "-O" and "-Os" because it should only be used if the driver being targeted has this problem. Fixes #1209.
2018-01-17 19:57:37 +00:00
source/opt/value_number_table.cpp \
Vector DCE (#1512) Introduce a pass that does a DCE type analysis for vector elements instead of the whole vector as a single element. It will then rewrite instructions that are not used with something else. For example, an instruction whose value are not used, even though it is referenced, is replaced with an OpUndef.
2018-04-23 15:13:07 +00:00
source/opt/vector_dce.cpp \
Create a pass to work around a driver bug related to OpUnreachable. We have come across a driver bug where and OpUnreachable inside a loop is causing the shader to go into an infinite loop. This commit will try to avoid this bug by turning OpUnreachable instructions that are contained in a loop into branches to the loop merge block. This is not added to "-O" and "-Os" because it should only be used if the driver being targeted has this problem. Fixes #1209.
2018-01-17 19:57:37 +00:00
source/opt/workaround1209.cpp
Add Android.mk to SPIRV-Tools Android.mk was migrated from shaderc/third_party. android_test is a stub, only builds spirv-tools libs.h to test build.
2017-10-05 23:07:31 +00:00
# Locations of grammar files.
Support SPIR-V 1.3 and Vulkan 1.1 The default target is SPIR-V 1.3. For example, spirv-as will generate a SPIR-V 1.3 binary by default. Use command line option "--target-env spv1.0" if you want to make a SPIR-V 1.0 binary or validate against SPIR-V 1.0 rules. Example: # Generate a SPIR-V 1.0 binary instead of SPIR-V 1.3 spirv-as --target-env spv1.0 a.spvasm -o a.spv spirv-as --target-env vulkan1.0 a.spvasm -o a.spv # Validate as SPIR-V 1.0. spirv-val --target-env spv1.0 a.spv # Validate as Vulkan 1.0 spirv-val --target-env vulkan1.0 a.spv
2018-02-09 19:29:02 +00:00
#
# TODO(dneto): Build a single set of tables that embeds versioning differences on
# a per-item basis. That must happen before SPIR-V 1.4, etc.
# https://github.com/KhronosGroup/SPIRV-Tools/issues/1195
Add Android.mk to SPIRV-Tools Android.mk was migrated from shaderc/third_party. android_test is a stub, only builds spirv-tools libs.h to test build.
2017-10-05 23:07:31 +00:00
SPV_CORE10_GRAMMAR=$(SPVHEADERS_LOCAL_PATH)/include/spirv/1.0/spirv.core.grammar.json
SPV_CORE11_GRAMMAR=$(SPVHEADERS_LOCAL_PATH)/include/spirv/1.1/spirv.core.grammar.json
SPV_CORE12_GRAMMAR=$(SPVHEADERS_LOCAL_PATH)/include/spirv/1.2/spirv.core.grammar.json
Android.mk: Generate enum mappings from unified1 grammar Some tokens are only showing up in the unified1 grammar. So enum string mappings have to be generated from that grammar, not the grammar from the (deprecated) include/spirv/1.2 grammar. Example: capabilities FragmentFullyCovered, Float16ImageAMD
2018-03-02 20:24:15 +00:00
SPV_COREUNIFIED1_GRAMMAR=$(SPVHEADERS_LOCAL_PATH)/include/spirv/unified1/spirv.core.grammar.json
SPV_CORELATEST_GRAMMAR=$(SPV_COREUNIFIED1_GRAMMAR)
Refactor include of latest spir-v header versions
2017-12-13 22:55:00 +00:00
SPV_GLSL_GRAMMAR=$(SPVHEADERS_LOCAL_PATH)/include/spirv/1.2/extinst.glsl.std.450.grammar.json
SPV_OPENCL_GRAMMAR=$(SPVHEADERS_LOCAL_PATH)/include/spirv/1.2/extinst.opencl.std.100.grammar.json
Add asm, dis support for DebugInfo extended instruction set Add grammar file for DebugInfo extended instruction set - Each new operand enum kind in extinst.debuginfo.grammar.json maps to a new value in spv_operand_type_t. - Add new concrete enum operand types for DebugInfo Generate a C header for the DebugInfo extended instruction set Add table lookup of DebugInfo extended instrutions Handle the debug info operand types in binary parser, disassembler, and assembler. Add DebugInfo round trip tests for assembler, disassembler Android.mk: Support DebugInfo extended instruction set The extinst.debuginfo.grammar.json file is currently part of SPIRV-Tools source. It contributes operand type enums, so it has to be processed along with the core grammar files. We also generate a C header DebugInfo.h. Add necessary grammar file processing to Android.mk.
2017-12-03 17:30:08 +00:00
# TODO(dneto): I expect the DebugInfo grammar file to eventually migrate to SPIRV-Headers
SPV_DEBUGINFO_GRAMMAR=$(LOCAL_PATH)/source/extinst.debuginfo.grammar.json
Add Android.mk to SPIRV-Tools Android.mk was migrated from shaderc/third_party. android_test is a stub, only builds spirv-tools libs.h to test build.
2017-10-05 23:07:31 +00:00
define gen_spvtools_grammar_tables
$(call generate-file-dir,$(1)/core.insts-1.0.inc)
Refactor include of latest spir-v header versions
2017-12-13 22:55:00 +00:00
$(1)/core.insts-1.0.inc $(1)/operand.kinds-1.0.inc $(1)/glsl.std.450.insts.inc $(1)/opencl.std.insts.inc: \
Add Android.mk to SPIRV-Tools Android.mk was migrated from shaderc/third_party. android_test is a stub, only builds spirv-tools libs.h to test build.
2017-10-05 23:07:31 +00:00
$(LOCAL_PATH)/utils/generate_grammar_tables.py \
$(SPV_CORE10_GRAMMAR) \
$(SPV_GLSL_GRAMMAR) \
Add asm, dis support for DebugInfo extended instruction set Add grammar file for DebugInfo extended instruction set - Each new operand enum kind in extinst.debuginfo.grammar.json maps to a new value in spv_operand_type_t. - Add new concrete enum operand types for DebugInfo Generate a C header for the DebugInfo extended instruction set Add table lookup of DebugInfo extended instrutions Handle the debug info operand types in binary parser, disassembler, and assembler. Add DebugInfo round trip tests for assembler, disassembler Android.mk: Support DebugInfo extended instruction set The extinst.debuginfo.grammar.json file is currently part of SPIRV-Tools source. It contributes operand type enums, so it has to be processed along with the core grammar files. We also generate a C header DebugInfo.h. Add necessary grammar file processing to Android.mk.
2017-12-03 17:30:08 +00:00
$(SPV_OPENCL_GRAMMAR) \
$(SPV_DEBUGINFO_GRAMMAR)
Add Android.mk to SPIRV-Tools Android.mk was migrated from shaderc/third_party. android_test is a stub, only builds spirv-tools libs.h to test build.
2017-10-05 23:07:31 +00:00
@$(HOST_PYTHON) $(LOCAL_PATH)/utils/generate_grammar_tables.py \
--spirv-core-grammar=$(SPV_CORE10_GRAMMAR) \
--extinst-glsl-grammar=$(SPV_GLSL_GRAMMAR) \
--extinst-opencl-grammar=$(SPV_OPENCL_GRAMMAR) \
Add asm, dis support for DebugInfo extended instruction set Add grammar file for DebugInfo extended instruction set - Each new operand enum kind in extinst.debuginfo.grammar.json maps to a new value in spv_operand_type_t. - Add new concrete enum operand types for DebugInfo Generate a C header for the DebugInfo extended instruction set Add table lookup of DebugInfo extended instrutions Handle the debug info operand types in binary parser, disassembler, and assembler. Add DebugInfo round trip tests for assembler, disassembler Android.mk: Support DebugInfo extended instruction set The extinst.debuginfo.grammar.json file is currently part of SPIRV-Tools source. It contributes operand type enums, so it has to be processed along with the core grammar files. We also generate a C header DebugInfo.h. Add necessary grammar file processing to Android.mk.
2017-12-03 17:30:08 +00:00
--extinst-debuginfo-grammar=$(SPV_DEBUGINFO_GRAMMAR) \
Add Android.mk to SPIRV-Tools Android.mk was migrated from shaderc/third_party. android_test is a stub, only builds spirv-tools libs.h to test build.
2017-10-05 23:07:31 +00:00
--core-insts-output=$(1)/core.insts-1.0.inc \
Refactor include of latest spir-v header versions
2017-12-13 22:55:00 +00:00
--glsl-insts-output=$(1)/glsl.std.450.insts.inc \
--opencl-insts-output=$(1)/opencl.std.insts.inc \
Add Android.mk to SPIRV-Tools Android.mk was migrated from shaderc/third_party. android_test is a stub, only builds spirv-tools libs.h to test build.
2017-10-05 23:07:31 +00:00
--operand-kinds-output=$(1)/operand.kinds-1.0.inc
@echo "[$(TARGET_ARCH_ABI)] Grammar v1.0 : instructions & operands <= grammar JSON files"
$(1)/core.insts-1.1.inc $(1)/operand.kinds-1.1.inc: \
$(LOCAL_PATH)/utils/generate_grammar_tables.py \
Add asm, dis support for DebugInfo extended instruction set Add grammar file for DebugInfo extended instruction set - Each new operand enum kind in extinst.debuginfo.grammar.json maps to a new value in spv_operand_type_t. - Add new concrete enum operand types for DebugInfo Generate a C header for the DebugInfo extended instruction set Add table lookup of DebugInfo extended instrutions Handle the debug info operand types in binary parser, disassembler, and assembler. Add DebugInfo round trip tests for assembler, disassembler Android.mk: Support DebugInfo extended instruction set The extinst.debuginfo.grammar.json file is currently part of SPIRV-Tools source. It contributes operand type enums, so it has to be processed along with the core grammar files. We also generate a C header DebugInfo.h. Add necessary grammar file processing to Android.mk.
2017-12-03 17:30:08 +00:00
$(SPV_CORE11_GRAMMAR) \
$(SPV_DEBUGINFO_GRAMMAR)
Add Android.mk to SPIRV-Tools Android.mk was migrated from shaderc/third_party. android_test is a stub, only builds spirv-tools libs.h to test build.
2017-10-05 23:07:31 +00:00
@$(HOST_PYTHON) $(LOCAL_PATH)/utils/generate_grammar_tables.py \
--spirv-core-grammar=$(SPV_CORE11_GRAMMAR) \
Add asm, dis support for DebugInfo extended instruction set Add grammar file for DebugInfo extended instruction set - Each new operand enum kind in extinst.debuginfo.grammar.json maps to a new value in spv_operand_type_t. - Add new concrete enum operand types for DebugInfo Generate a C header for the DebugInfo extended instruction set Add table lookup of DebugInfo extended instrutions Handle the debug info operand types in binary parser, disassembler, and assembler. Add DebugInfo round trip tests for assembler, disassembler Android.mk: Support DebugInfo extended instruction set The extinst.debuginfo.grammar.json file is currently part of SPIRV-Tools source. It contributes operand type enums, so it has to be processed along with the core grammar files. We also generate a C header DebugInfo.h. Add necessary grammar file processing to Android.mk.
2017-12-03 17:30:08 +00:00
--extinst-debuginfo-grammar=$(SPV_DEBUGINFO_GRAMMAR) \
Add Android.mk to SPIRV-Tools Android.mk was migrated from shaderc/third_party. android_test is a stub, only builds spirv-tools libs.h to test build.
2017-10-05 23:07:31 +00:00
--core-insts-output=$(1)/core.insts-1.1.inc \
--operand-kinds-output=$(1)/operand.kinds-1.1.inc
@echo "[$(TARGET_ARCH_ABI)] Grammar v1.1 : instructions & operands <= grammar JSON files"
$(1)/core.insts-1.2.inc $(1)/operand.kinds-1.2.inc: \
$(LOCAL_PATH)/utils/generate_grammar_tables.py \
Add asm, dis support for DebugInfo extended instruction set Add grammar file for DebugInfo extended instruction set - Each new operand enum kind in extinst.debuginfo.grammar.json maps to a new value in spv_operand_type_t. - Add new concrete enum operand types for DebugInfo Generate a C header for the DebugInfo extended instruction set Add table lookup of DebugInfo extended instrutions Handle the debug info operand types in binary parser, disassembler, and assembler. Add DebugInfo round trip tests for assembler, disassembler Android.mk: Support DebugInfo extended instruction set The extinst.debuginfo.grammar.json file is currently part of SPIRV-Tools source. It contributes operand type enums, so it has to be processed along with the core grammar files. We also generate a C header DebugInfo.h. Add necessary grammar file processing to Android.mk.
2017-12-03 17:30:08 +00:00
$(SPV_CORE12_GRAMMAR) \
$(SPV_DEBUGINFO_GRAMMAR)
Add Android.mk to SPIRV-Tools Android.mk was migrated from shaderc/third_party. android_test is a stub, only builds spirv-tools libs.h to test build.
2017-10-05 23:07:31 +00:00
@$(HOST_PYTHON) $(LOCAL_PATH)/utils/generate_grammar_tables.py \
--spirv-core-grammar=$(SPV_CORE12_GRAMMAR) \
Add asm, dis support for DebugInfo extended instruction set Add grammar file for DebugInfo extended instruction set - Each new operand enum kind in extinst.debuginfo.grammar.json maps to a new value in spv_operand_type_t. - Add new concrete enum operand types for DebugInfo Generate a C header for the DebugInfo extended instruction set Add table lookup of DebugInfo extended instrutions Handle the debug info operand types in binary parser, disassembler, and assembler. Add DebugInfo round trip tests for assembler, disassembler Android.mk: Support DebugInfo extended instruction set The extinst.debuginfo.grammar.json file is currently part of SPIRV-Tools source. It contributes operand type enums, so it has to be processed along with the core grammar files. We also generate a C header DebugInfo.h. Add necessary grammar file processing to Android.mk.
2017-12-03 17:30:08 +00:00
--extinst-debuginfo-grammar=$(SPV_DEBUGINFO_GRAMMAR) \
Add Android.mk to SPIRV-Tools Android.mk was migrated from shaderc/third_party. android_test is a stub, only builds spirv-tools libs.h to test build.
2017-10-05 23:07:31 +00:00
--core-insts-output=$(1)/core.insts-1.2.inc \
--operand-kinds-output=$(1)/operand.kinds-1.2.inc
@echo "[$(TARGET_ARCH_ABI)] Grammar v1.2 : instructions & operands <= grammar JSON files"
Support SPIR-V 1.3 and Vulkan 1.1 The default target is SPIR-V 1.3. For example, spirv-as will generate a SPIR-V 1.3 binary by default. Use command line option "--target-env spv1.0" if you want to make a SPIR-V 1.0 binary or validate against SPIR-V 1.0 rules. Example: # Generate a SPIR-V 1.0 binary instead of SPIR-V 1.3 spirv-as --target-env spv1.0 a.spvasm -o a.spv spirv-as --target-env vulkan1.0 a.spvasm -o a.spv # Validate as SPIR-V 1.0. spirv-val --target-env spv1.0 a.spv # Validate as Vulkan 1.0 spirv-val --target-env vulkan1.0 a.spv
2018-02-09 19:29:02 +00:00
$(1)/core.insts-unified1.inc $(1)/operand.kinds-unified1.inc: \
$(LOCAL_PATH)/utils/generate_grammar_tables.py \
$(SPV_COREUNIFIED1_GRAMMAR) \
$(SPV_DEBUGINFO_GRAMMAR)
@$(HOST_PYTHON) $(LOCAL_PATH)/utils/generate_grammar_tables.py \
--spirv-core-grammar=$(SPV_COREUNIFIED1_GRAMMAR) \
--extinst-debuginfo-grammar=$(SPV_DEBUGINFO_GRAMMAR) \
--core-insts-output=$(1)/core.insts-unified1.inc \
--operand-kinds-output=$(1)/operand.kinds-unified1.inc
@echo "[$(TARGET_ARCH_ABI)] Grammar v1.3 (from unified1) : instructions & operands <= grammar JSON files"
$(LOCAL_PATH)/source/opcode.cpp: $(1)/core.insts-1.0.inc $(1)/core.insts-1.1.inc $(1)/core.insts-1.2.inc $(1)/core.insts-unified1.inc
$(LOCAL_PATH)/source/operand.cpp: $(1)/operand.kinds-1.0.inc $(1)/operand.kinds-1.1.inc $(1)/operand.kinds-1.2.inc $(1)/operand.kinds-unified1.inc
$(LOCAL_PATH)/source/ext_inst.cpp: \
$(1)/glsl.std.450.insts.inc \
$(1)/opencl.std.insts.inc \
$(1)/debuginfo.insts.inc \
$(1)/spv-amd-gcn-shader.insts.inc \
$(1)/spv-amd-shader-ballot.insts.inc \
$(1)/spv-amd-shader-explicit-vertex-parameter.insts.inc \
$(1)/spv-amd-shader-trinary-minmax.insts.inc
Add Android.mk to SPIRV-Tools Android.mk was migrated from shaderc/third_party. android_test is a stub, only builds spirv-tools libs.h to test build.
2017-10-05 23:07:31 +00:00
endef
$(eval $(call gen_spvtools_grammar_tables,$(SPVTOOLS_OUT_PATH)))
Add asm, dis support for DebugInfo extended instruction set Add grammar file for DebugInfo extended instruction set - Each new operand enum kind in extinst.debuginfo.grammar.json maps to a new value in spv_operand_type_t. - Add new concrete enum operand types for DebugInfo Generate a C header for the DebugInfo extended instruction set Add table lookup of DebugInfo extended instrutions Handle the debug info operand types in binary parser, disassembler, and assembler. Add DebugInfo round trip tests for assembler, disassembler Android.mk: Support DebugInfo extended instruction set The extinst.debuginfo.grammar.json file is currently part of SPIRV-Tools source. It contributes operand type enums, so it has to be processed along with the core grammar files. We also generate a C header DebugInfo.h. Add necessary grammar file processing to Android.mk.
2017-12-03 17:30:08 +00:00
define gen_spvtools_lang_headers
# Generate language-specific headers. So far we only generate C headers
# $1 is the output directory.
# $2 is the base name of the header file, e.g. "DebugInfo".
# $3 is the grammar file containing token definitions.
$(call generate-file-dir,$(1)/$(2).h)
$(1)/$(2).h : \
$(LOCAL_PATH)/utils/generate_language_headers.py \
$(3)
@$(HOST_PYTHON) $(LOCAL_PATH)/utils/generate_language_headers.py \
--extinst-name=$(2) \
--extinst-grammar=$(3) \
--extinst-output-base=$(1)/$(2)
@echo "[$(TARGET_ARCH_ABI)] Generate language specific header for $(2): headers <= grammar"
$(LOCAL_PATH)/source/ext_inst.cpp: $(1)/$(2).h
endef
# We generate language-specific headers for DebugInfo
$(eval $(call gen_spvtools_lang_headers,$(SPVTOOLS_OUT_PATH),DebugInfo,$(SPV_DEBUGINFO_GRAMMAR)))
Add Android.mk to SPIRV-Tools Android.mk was migrated from shaderc/third_party. android_test is a stub, only builds spirv-tools libs.h to test build.
2017-10-05 23:07:31 +00:00
define gen_spvtools_vendor_tables
$(call generate-file-dir,$(1)/$(2).insts.inc)
$(1)/$(2).insts.inc : \
$(LOCAL_PATH)/utils/generate_grammar_tables.py \
$(LOCAL_PATH)/source/extinst.$(2).grammar.json
@$(HOST_PYTHON) $(LOCAL_PATH)/utils/generate_grammar_tables.py \
--extinst-vendor-grammar=$(LOCAL_PATH)/source/extinst.$(2).grammar.json \
--vendor-insts-output=$(1)/$(2).insts.inc
@echo "[$(TARGET_ARCH_ABI)] Vendor extended instruction set: $(2) tables <= grammar"
$(LOCAL_PATH)/source/ext_inst.cpp: $(1)/$(2).insts.inc
endef
# Vendor extended instruction sets, with grammars from SPIRV-Tools source tree.
SPV_NONSTANDARD_EXTINST_GRAMMARS=$(foreach F,$(wildcard $(LOCAL_PATH)/source/extinst.*.grammar.json),$(patsubst extinst.%.grammar.json,%,$(notdir $F)))
$(foreach E,$(SPV_NONSTANDARD_EXTINST_GRAMMARS),$(eval $(call gen_spvtools_vendor_tables,$(SPVTOOLS_OUT_PATH),$E)))
define gen_spvtools_enum_string_mapping
$(call generate-file-dir,$(1)/extension_enum.inc.inc)
$(1)/extension_enum.inc $(1)/enum_string_mapping.inc: \
$(LOCAL_PATH)/utils/generate_grammar_tables.py \
Add asm, dis support for DebugInfo extended instruction set Add grammar file for DebugInfo extended instruction set - Each new operand enum kind in extinst.debuginfo.grammar.json maps to a new value in spv_operand_type_t. - Add new concrete enum operand types for DebugInfo Generate a C header for the DebugInfo extended instruction set Add table lookup of DebugInfo extended instrutions Handle the debug info operand types in binary parser, disassembler, and assembler. Add DebugInfo round trip tests for assembler, disassembler Android.mk: Support DebugInfo extended instruction set The extinst.debuginfo.grammar.json file is currently part of SPIRV-Tools source. It contributes operand type enums, so it has to be processed along with the core grammar files. We also generate a C header DebugInfo.h. Add necessary grammar file processing to Android.mk.
2017-12-03 17:30:08 +00:00
$(SPV_CORELATEST_GRAMMAR)
Add Android.mk to SPIRV-Tools Android.mk was migrated from shaderc/third_party. android_test is a stub, only builds spirv-tools libs.h to test build.
2017-10-05 23:07:31 +00:00
@$(HOST_PYTHON) $(LOCAL_PATH)/utils/generate_grammar_tables.py \
Add asm, dis support for DebugInfo extended instruction set Add grammar file for DebugInfo extended instruction set - Each new operand enum kind in extinst.debuginfo.grammar.json maps to a new value in spv_operand_type_t. - Add new concrete enum operand types for DebugInfo Generate a C header for the DebugInfo extended instruction set Add table lookup of DebugInfo extended instrutions Handle the debug info operand types in binary parser, disassembler, and assembler. Add DebugInfo round trip tests for assembler, disassembler Android.mk: Support DebugInfo extended instruction set The extinst.debuginfo.grammar.json file is currently part of SPIRV-Tools source. It contributes operand type enums, so it has to be processed along with the core grammar files. We also generate a C header DebugInfo.h. Add necessary grammar file processing to Android.mk.
2017-12-03 17:30:08 +00:00
--spirv-core-grammar=$(SPV_CORELATEST_GRAMMAR) \
--extinst-debuginfo-grammar=$(SPV_DEBUGINFO_GRAMMAR) \
Add Android.mk to SPIRV-Tools Android.mk was migrated from shaderc/third_party. android_test is a stub, only builds spirv-tools libs.h to test build.
2017-10-05 23:07:31 +00:00
--extension-enum-output=$(1)/extension_enum.inc \
--enum-string-mapping-output=$(1)/enum_string_mapping.inc
@echo "[$(TARGET_ARCH_ABI)] Generate enum<->string mapping <= grammar JSON files"
# Generated header extension_enum.inc is transitively included by table.h, which is
# used pervasively. Capture the pervasive dependency.
$(foreach F,$(SPVTOOLS_SRC_FILES) $(SPVTOOLS_OPT_SRC_FILES),$(LOCAL_PATH)/$F ) \
: $(1)/extension_enum.inc
$(LOCAL_PATH)/source/enum_string_mapping.cpp: $(1)/enum_string_mapping.inc
endef
$(eval $(call gen_spvtools_enum_string_mapping,$(SPVTOOLS_OUT_PATH)))
define gen_spvtools_build_version_inc
$(call generate-file-dir,$(1)/dummy_filename)
$(1)/build-version.inc: \
$(LOCAL_PATH)/utils/update_build_version.py \
$(LOCAL_PATH)/CHANGES
@$(HOST_PYTHON) $(LOCAL_PATH)/utils/update_build_version.py \
$(LOCAL_PATH) $(1)/build-version.inc
@echo "[$(TARGET_ARCH_ABI)] Generate : build-version.inc <= CHANGES"
$(LOCAL_PATH)/source/software_version.cpp: $(1)/build-version.inc
endef
$(eval $(call gen_spvtools_build_version_inc,$(SPVTOOLS_OUT_PATH)))
define gen_spvtools_generators_inc
$(call generate-file-dir,$(1)/dummy_filename)
$(1)/generators.inc: \
$(LOCAL_PATH)/utils/generate_registry_tables.py \
$(SPVHEADERS_LOCAL_PATH)/include/spirv/spir-v.xml
@$(HOST_PYTHON) $(LOCAL_PATH)/utils/generate_registry_tables.py \
--xml=$(SPVHEADERS_LOCAL_PATH)/include/spirv/spir-v.xml \
--generator-output=$(1)/generators.inc
@echo "[$(TARGET_ARCH_ABI)] Generate : generators.inc <= spir-v.xml"
$(LOCAL_PATH)/source/opcode.cpp: $(1)/generators.inc
endef
$(eval $(call gen_spvtools_generators_inc,$(SPVTOOLS_OUT_PATH)))
include $(CLEAR_VARS)
LOCAL_MODULE := SPIRV-Tools
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/include \
[ndk-build] Make SPIRV-Headers location configurable (#2126)
2018-11-28 14:13:38 +00:00
$(SPVHEADERS_LOCAL_PATH)/include \
Add Android.mk to SPIRV-Tools Android.mk was migrated from shaderc/third_party. android_test is a stub, only builds spirv-tools libs.h to test build.
2017-10-05 23:07:31 +00:00
$(SPVTOOLS_OUT_PATH)
LOCAL_EXPORT_C_INCLUDES := \
$(LOCAL_PATH)/include
LOCAL_CXXFLAGS:=-std=c++11 -fno-exceptions -fno-rtti -Werror
LOCAL_SRC_FILES:= $(SPVTOOLS_SRC_FILES)
include $(BUILD_STATIC_LIBRARY)
include $(CLEAR_VARS)
LOCAL_MODULE := SPIRV-Tools-opt
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/include \
$(LOCAL_PATH)/source \
[ndk-build] Make SPIRV-Headers location configurable (#2126)
2018-11-28 14:13:38 +00:00
$(SPVHEADERS_LOCAL_PATH)/include \
Add Android.mk to SPIRV-Tools Android.mk was migrated from shaderc/third_party. android_test is a stub, only builds spirv-tools libs.h to test build.
2017-10-05 23:07:31 +00:00
$(SPVTOOLS_OUT_PATH)
LOCAL_CXXFLAGS:=-std=c++11 -fno-exceptions -fno-rtti -Werror
LOCAL_STATIC_LIBRARIES:=SPIRV-Tools
LOCAL_SRC_FILES:= $(SPVTOOLS_OPT_SRC_FILES)
include $(BUILD_STATIC_LIBRARY)
Reference in New Issue Copy Permalink