projects / platform / upstream / SPIRV-Tools.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Disable check which fails Vulkan CTS
[platform/upstream/SPIRV-Tools.git] / Android.mk
diff --git a/Android.mk b/Android.mk
index ed52151..3a59c20 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -33,16 +33,26 @@ SPVTOOLS_SRC_FILES := \
                source/val/instruction.cpp \
                source/val/validation_state.cpp \
                source/validate.cpp \
+               source/validate_adjacency.cpp \
                source/validate_arithmetics.cpp \
+               source/validate_atomics.cpp \
+               source/validate_barriers.cpp \
                source/validate_bitwise.cpp \
-               source/validate_cfg.cpp \
                source/validate_capability.cpp \
+               source/validate_cfg.cpp \
+               source/validate_composites.cpp \
+               source/validate_conversion.cpp \
                source/validate_datarules.cpp \
                source/validate_decorations.cpp \
+               source/validate_derivatives.cpp \
+               source/validate_ext_inst.cpp \
                source/validate_id.cpp \
+               source/validate_image.cpp \
                source/validate_instruction.cpp \
                source/validate_layout.cpp \
+               source/validate_literals.cpp \
                source/validate_logicals.cpp \
+               source/validate_primitives.cpp \
                source/validate_type_unique.cpp
 
 SPVTOOLS_OPT_SRC_FILES := \
@@ -50,87 +60,140 @@ SPVTOOLS_OPT_SRC_FILES := \
                source/opt/basic_block.cpp \
                source/opt/block_merge_pass.cpp \
                source/opt/build_module.cpp \
+               source/opt/cfg.cpp \
                source/opt/cfg_cleanup_pass.cpp \
+               source/opt/ccp_pass.cpp \
                source/opt/compact_ids_pass.cpp \
+               source/opt/composite.cpp \
                source/opt/common_uniform_elim_pass.cpp \
+               source/opt/constants.cpp \
                source/opt/dead_branch_elim_pass.cpp \
+               source/opt/dead_insert_elim_pass.cpp \
+               source/opt/dead_variable_elimination.cpp \
                source/opt/decoration_manager.cpp \
                source/opt/def_use_manager.cpp \
+               source/opt/dominator_analysis.cpp \
+               source/opt/dominator_tree.cpp \
                source/opt/eliminate_dead_constant_pass.cpp \
                source/opt/eliminate_dead_functions_pass.cpp \
+               source/opt/feature_manager.cpp \
                source/opt/flatten_decoration_pass.cpp \
                source/opt/fold.cpp \
+               source/opt/folding_rules.cpp \
                source/opt/fold_spec_constant_op_and_composite_pass.cpp \
                source/opt/freeze_spec_constant_value_pass.cpp \
                source/opt/function.cpp \
+               source/opt/if_conversion.cpp \
                source/opt/inline_pass.cpp \
                source/opt/inline_exhaustive_pass.cpp \
                source/opt/inline_opaque_pass.cpp \
                source/opt/insert_extract_elim.cpp \
                source/opt/instruction.cpp \
+               source/opt/instruction_list.cpp \
+               source/opt/ir_context.cpp \
                source/opt/ir_loader.cpp \
                source/opt/local_access_chain_convert_pass.cpp \
+               source/opt/local_redundancy_elimination.cpp \
                source/opt/local_single_block_elim_pass.cpp \
                source/opt/local_single_store_elim_pass.cpp \
                source/opt/local_ssa_elim_pass.cpp \
+               source/opt/loop_descriptor.cpp \
                source/opt/mem_pass.cpp \
+               source/opt/merge_return_pass.cpp \
                source/opt/module.cpp \
                source/opt/optimizer.cpp \
                source/opt/pass.cpp \
                source/opt/pass_manager.cpp \
+               source/opt/private_to_local_pass.cpp \
+               source/opt/propagator.cpp \
+               source/opt/redundancy_elimination.cpp \
                source/opt/remove_duplicates_pass.cpp \
+               source/opt/replace_invalid_opc.cpp \
+               source/opt/scalar_replacement_pass.cpp \
                source/opt/set_spec_constant_default_value_pass.cpp \
                source/opt/strength_reduction_pass.cpp \
                source/opt/strip_debug_info_pass.cpp \
                source/opt/type_manager.cpp \
                source/opt/types.cpp \
-               source/opt/unify_const_pass.cpp
+               source/opt/unify_const_pass.cpp \
+               source/opt/value_number_table.cpp \
+               source/opt/workaround1209.cpp
 
 # Locations of grammar files.
 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
-SPV_GLSL_GRAMMAR=$(SPVHEADERS_LOCAL_PATH)/include/spirv/1.0/extinst.glsl.std.450.grammar.json
-SPV_OPENCL_GRAMMAR=$(SPVHEADERS_LOCAL_PATH)/include/spirv/1.0/extinst.opencl.std.100.grammar.json
+SPV_CORELATEST_GRAMMAR=$(SPV_CORE12_GRAMMAR)
+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
+# TODO(dneto): I expect the DebugInfo grammar file to eventually migrate to SPIRV-Headers
+SPV_DEBUGINFO_GRAMMAR=$(LOCAL_PATH)/source/extinst.debuginfo.grammar.json
 
 define gen_spvtools_grammar_tables
 $(call generate-file-dir,$(1)/core.insts-1.0.inc)
-$(1)/core.insts-1.0.inc $(1)/operand.kinds-1.0.inc $(1)/glsl.std.450.insts-1.0.inc $(1)/opencl.std.insts-1.0.inc: \
+$(1)/core.insts-1.0.inc $(1)/operand.kinds-1.0.inc $(1)/glsl.std.450.insts.inc $(1)/opencl.std.insts.inc: \
         $(LOCAL_PATH)/utils/generate_grammar_tables.py \
         $(SPV_CORE10_GRAMMAR) \
         $(SPV_GLSL_GRAMMAR) \
-        $(SPV_OPENCL_GRAMMAR)
+        $(SPV_OPENCL_GRAMMAR) \
+        $(SPV_DEBUGINFO_GRAMMAR)
                @$(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) \
+                               --extinst-debuginfo-grammar=$(SPV_DEBUGINFO_GRAMMAR) \
                                --core-insts-output=$(1)/core.insts-1.0.inc \
-                               --glsl-insts-output=$(1)/glsl.std.450.insts-1.0.inc \
-                               --opencl-insts-output=$(1)/opencl.std.insts-1.0.inc \
+                               --glsl-insts-output=$(1)/glsl.std.450.insts.inc \
+                               --opencl-insts-output=$(1)/opencl.std.insts.inc \
                                --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 \
-        $(SPV_CORE11_GRAMMAR)
+        $(SPV_CORE11_GRAMMAR) \
+        $(SPV_DEBUGINFO_GRAMMAR)
                @$(HOST_PYTHON) $(LOCAL_PATH)/utils/generate_grammar_tables.py \
                                --spirv-core-grammar=$(SPV_CORE11_GRAMMAR) \
+                               --extinst-debuginfo-grammar=$(SPV_DEBUGINFO_GRAMMAR) \
                                --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 \
-        $(SPV_CORE12_GRAMMAR)
+        $(SPV_CORE12_GRAMMAR) \
+        $(SPV_DEBUGINFO_GRAMMAR)
                @$(HOST_PYTHON) $(LOCAL_PATH)/utils/generate_grammar_tables.py \
                                --spirv-core-grammar=$(SPV_CORE12_GRAMMAR) \
+                               --extinst-debuginfo-grammar=$(SPV_DEBUGINFO_GRAMMAR) \
                                --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"
 $(LOCAL_PATH)/source/opcode.cpp: $(1)/core.insts-1.0.inc $(1)/core.insts-1.1.inc $(1)/core.insts-1.2.inc
 $(LOCAL_PATH)/source/operand.cpp: $(1)/operand.kinds-1.0.inc $(1)/operand.kinds-1.1.inc $(1)/operand.kinds-1.2.inc
-$(LOCAL_PATH)/source/ext_inst.cpp: $(1)/glsl.std.450.insts-1.0.inc $(1)/opencl.std.insts-1.0.inc
+$(LOCAL_PATH)/source/ext_inst.cpp: $(1)/glsl.std.450.insts.inc $(1)/opencl.std.insts.inc
 endef
 $(eval $(call gen_spvtools_grammar_tables,$(SPVTOOLS_OUT_PATH)))
 
+
+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)))
+
+
 define gen_spvtools_vendor_tables
 $(call generate-file-dir,$(1)/$(2).insts.inc)
 $(1)/$(2).insts.inc : \
@@ -150,9 +213,10 @@ 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 \
-        $(SPV_CORE11_GRAMMAR)
+        $(SPV_CORELATEST_GRAMMAR)
                @$(HOST_PYTHON) $(LOCAL_PATH)/utils/generate_grammar_tables.py \
-                               --spirv-core-grammar=$(SPV_CORE11_GRAMMAR) \
+                               --spirv-core-grammar=$(SPV_CORELATEST_GRAMMAR) \
+                               --extinst-debuginfo-grammar=$(SPV_DEBUGINFO_GRAMMAR) \
                                --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"
Domain: Graphics System / GL;