[Mesa-dev] [PATCH 24/24] i965: Move the back-end compiler to src/intel/compiler
Jason Ekstrand
jason at jlekstrand.net
Wed Mar 1 05:03:36 UTC 2017
---
src/intel/Makefile.am | 2 +
src/intel/Makefile.compiler.am | 116 +++++++++++++++++++++
src/intel/Makefile.sources | 89 ++++++++++++++++
src/intel/compiler/.gitignore | 1 +
.../dri/i965 => intel/compiler}/brw_cfg.cpp | 0
.../drivers/dri/i965 => intel/compiler}/brw_cfg.h | 0
.../dri/i965 => intel/compiler}/brw_compiler.c | 0
.../dri/i965 => intel/compiler}/brw_compiler.h | 0
.../compiler}/brw_dead_control_flow.cpp | 0
.../compiler}/brw_dead_control_flow.h | 0
.../dri/i965 => intel/compiler}/brw_disasm.c | 0
.../drivers/dri/i965 => intel/compiler}/brw_eu.c | 0
.../drivers/dri/i965 => intel/compiler}/brw_eu.h | 0
.../dri/i965 => intel/compiler}/brw_eu_compact.c | 0
.../dri/i965 => intel/compiler}/brw_eu_emit.c | 0
.../dri/i965 => intel/compiler}/brw_eu_util.c | 0
.../dri/i965 => intel/compiler}/brw_eu_validate.c | 0
.../drivers/dri/i965 => intel/compiler}/brw_fs.cpp | 0
.../drivers/dri/i965 => intel/compiler}/brw_fs.h | 0
.../dri/i965 => intel/compiler}/brw_fs_builder.h | 0
.../compiler}/brw_fs_cmod_propagation.cpp | 0
.../compiler}/brw_fs_combine_constants.cpp | 0
.../compiler}/brw_fs_copy_propagation.cpp | 0
.../dri/i965 => intel/compiler}/brw_fs_cse.cpp | 0
.../compiler}/brw_fs_dead_code_eliminate.cpp | 0
.../i965 => intel/compiler}/brw_fs_generator.cpp | 0
.../compiler}/brw_fs_live_variables.cpp | 0
.../compiler}/brw_fs_live_variables.h | 0
.../i965 => intel/compiler}/brw_fs_lower_d2x.cpp | 0
.../i965 => intel/compiler}/brw_fs_lower_pack.cpp | 0
.../dri/i965 => intel/compiler}/brw_fs_nir.cpp | 0
.../compiler}/brw_fs_reg_allocate.cpp | 0
.../compiler}/brw_fs_register_coalesce.cpp | 0
.../compiler}/brw_fs_saturate_propagation.cpp | 0
.../compiler}/brw_fs_sel_peephole.cpp | 0
.../compiler}/brw_fs_surface_builder.cpp | 0
.../compiler}/brw_fs_surface_builder.h | 0
.../i965 => intel/compiler}/brw_fs_validate.cpp | 0
.../dri/i965 => intel/compiler}/brw_fs_visitor.cpp | 0
.../drivers/dri/i965 => intel/compiler}/brw_inst.h | 0
.../compiler}/brw_interpolation_map.c | 0
.../dri/i965 => intel/compiler}/brw_ir_allocator.h | 0
.../dri/i965 => intel/compiler}/brw_ir_fs.h | 0
.../dri/i965 => intel/compiler}/brw_ir_vec4.h | 0
.../drivers/dri/i965 => intel/compiler}/brw_nir.c | 0
.../drivers/dri/i965 => intel/compiler}/brw_nir.h | 0
.../compiler}/brw_nir_analyze_boolean_resolves.c | 0
.../compiler}/brw_nir_attribute_workarounds.c | 0
.../i965 => intel/compiler}/brw_nir_intrinsics.c | 0
.../compiler}/brw_nir_opt_peephole_ffma.c | 0
.../compiler}/brw_nir_tcs_workarounds.c | 0
.../compiler}/brw_nir_trig_workarounds.py | 0
.../dri/i965 => intel/compiler}/brw_packed_float.c | 0
.../compiler}/brw_predicated_break.cpp | 0
.../drivers/dri/i965 => intel/compiler}/brw_reg.h | 0
.../compiler}/brw_schedule_instructions.cpp | 0
.../dri/i965 => intel/compiler}/brw_shader.cpp | 0
.../dri/i965 => intel/compiler}/brw_shader.h | 0
.../dri/i965 => intel/compiler}/brw_vec4.cpp | 0
.../drivers/dri/i965 => intel/compiler}/brw_vec4.h | 0
.../dri/i965 => intel/compiler}/brw_vec4_builder.h | 0
.../compiler}/brw_vec4_cmod_propagation.cpp | 0
.../compiler}/brw_vec4_copy_propagation.cpp | 0
.../dri/i965 => intel/compiler}/brw_vec4_cse.cpp | 0
.../compiler}/brw_vec4_dead_code_eliminate.cpp | 0
.../i965 => intel/compiler}/brw_vec4_generator.cpp | 0
.../i965 => intel/compiler}/brw_vec4_gs_nir.cpp | 0
.../compiler}/brw_vec4_gs_visitor.cpp | 0
.../i965 => intel/compiler}/brw_vec4_gs_visitor.h | 0
.../compiler}/brw_vec4_live_variables.cpp | 0
.../compiler}/brw_vec4_live_variables.h | 0
.../dri/i965 => intel/compiler}/brw_vec4_nir.cpp | 0
.../compiler}/brw_vec4_reg_allocate.cpp | 0
.../compiler}/brw_vec4_surface_builder.cpp | 0
.../compiler}/brw_vec4_surface_builder.h | 0
.../dri/i965 => intel/compiler}/brw_vec4_tcs.cpp | 0
.../dri/i965 => intel/compiler}/brw_vec4_tcs.h | 0
.../dri/i965 => intel/compiler}/brw_vec4_tes.cpp | 0
.../dri/i965 => intel/compiler}/brw_vec4_tes.h | 0
.../i965 => intel/compiler}/brw_vec4_visitor.cpp | 0
.../compiler}/brw_vec4_vs_visitor.cpp | 0
.../dri/i965 => intel/compiler}/brw_vue_map.c | 0
.../dri/i965 => intel/compiler}/brw_wm_iz.cpp | 0
.../i965 => intel/compiler}/gen6_gs_visitor.cpp | 0
.../dri/i965 => intel/compiler}/gen6_gs_visitor.h | 0
.../i965 => intel/compiler}/intel_asm_annotation.c | 0
.../dri/i965 => intel/compiler}/test_eu_compact.c | 0
.../i965 => intel/compiler}/test_eu_validate.cpp | 0
.../compiler}/test_fs_cmod_propagation.cpp | 0
.../compiler}/test_fs_copy_propagation.cpp | 0
.../compiler}/test_fs_saturate_propagation.cpp | 0
.../compiler}/test_vec4_cmod_propagation.cpp | 0
.../compiler}/test_vec4_copy_propagation.cpp | 0
.../compiler}/test_vec4_register_coalesce.cpp | 0
.../compiler}/test_vf_float_conversions.cpp | 0
src/mesa/drivers/dri/i965/Makefile.am | 86 ---------------
src/mesa/drivers/dri/i965/Makefile.sources | 93 -----------------
97 files changed, 208 insertions(+), 179 deletions(-)
create mode 100644 src/intel/Makefile.compiler.am
create mode 100644 src/intel/compiler/.gitignore
rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_cfg.cpp (100%)
rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_cfg.h (100%)
rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_compiler.c (100%)
rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_compiler.h (100%)
rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_dead_control_flow.cpp (100%)
rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_dead_control_flow.h (100%)
rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_disasm.c (100%)
rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_eu.c (100%)
rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_eu.h (100%)
rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_eu_compact.c (100%)
rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_eu_emit.c (100%)
rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_eu_util.c (100%)
rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_eu_validate.c (100%)
rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_fs.cpp (100%)
rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_fs.h (100%)
rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_fs_builder.h (100%)
rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_fs_cmod_propagation.cpp (100%)
rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_fs_combine_constants.cpp (100%)
rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_fs_copy_propagation.cpp (100%)
rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_fs_cse.cpp (100%)
rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_fs_dead_code_eliminate.cpp (100%)
rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_fs_generator.cpp (100%)
rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_fs_live_variables.cpp (100%)
rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_fs_live_variables.h (100%)
rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_fs_lower_d2x.cpp (100%)
rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_fs_lower_pack.cpp (100%)
rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_fs_nir.cpp (100%)
rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_fs_reg_allocate.cpp (100%)
rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_fs_register_coalesce.cpp (100%)
rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_fs_saturate_propagation.cpp (100%)
rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_fs_sel_peephole.cpp (100%)
rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_fs_surface_builder.cpp (100%)
rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_fs_surface_builder.h (100%)
rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_fs_validate.cpp (100%)
rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_fs_visitor.cpp (100%)
rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_inst.h (100%)
rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_interpolation_map.c (100%)
rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_ir_allocator.h (100%)
rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_ir_fs.h (100%)
rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_ir_vec4.h (100%)
rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_nir.c (100%)
rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_nir.h (100%)
rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_nir_analyze_boolean_resolves.c (100%)
rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_nir_attribute_workarounds.c (100%)
rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_nir_intrinsics.c (100%)
rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_nir_opt_peephole_ffma.c (100%)
rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_nir_tcs_workarounds.c (100%)
rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_nir_trig_workarounds.py (100%)
rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_packed_float.c (100%)
rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_predicated_break.cpp (100%)
rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_reg.h (100%)
rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_schedule_instructions.cpp (100%)
rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_shader.cpp (100%)
rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_shader.h (100%)
rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_vec4.cpp (100%)
rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_vec4.h (100%)
rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_vec4_builder.h (100%)
rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_vec4_cmod_propagation.cpp (100%)
rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_vec4_copy_propagation.cpp (100%)
rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_vec4_cse.cpp (100%)
rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_vec4_dead_code_eliminate.cpp (100%)
rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_vec4_generator.cpp (100%)
rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_vec4_gs_nir.cpp (100%)
rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_vec4_gs_visitor.cpp (100%)
rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_vec4_gs_visitor.h (100%)
rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_vec4_live_variables.cpp (100%)
rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_vec4_live_variables.h (100%)
rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_vec4_nir.cpp (100%)
rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_vec4_reg_allocate.cpp (100%)
rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_vec4_surface_builder.cpp (100%)
rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_vec4_surface_builder.h (100%)
rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_vec4_tcs.cpp (100%)
rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_vec4_tcs.h (100%)
rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_vec4_tes.cpp (100%)
rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_vec4_tes.h (100%)
rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_vec4_visitor.cpp (100%)
rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_vec4_vs_visitor.cpp (100%)
rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_vue_map.c (100%)
rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_wm_iz.cpp (100%)
rename src/{mesa/drivers/dri/i965 => intel/compiler}/gen6_gs_visitor.cpp (100%)
rename src/{mesa/drivers/dri/i965 => intel/compiler}/gen6_gs_visitor.h (100%)
rename src/{mesa/drivers/dri/i965 => intel/compiler}/intel_asm_annotation.c (100%)
rename src/{mesa/drivers/dri/i965 => intel/compiler}/test_eu_compact.c (100%)
rename src/{mesa/drivers/dri/i965 => intel/compiler}/test_eu_validate.cpp (100%)
rename src/{mesa/drivers/dri/i965 => intel/compiler}/test_fs_cmod_propagation.cpp (100%)
rename src/{mesa/drivers/dri/i965 => intel/compiler}/test_fs_copy_propagation.cpp (100%)
rename src/{mesa/drivers/dri/i965 => intel/compiler}/test_fs_saturate_propagation.cpp (100%)
rename src/{mesa/drivers/dri/i965 => intel/compiler}/test_vec4_cmod_propagation.cpp (100%)
rename src/{mesa/drivers/dri/i965 => intel/compiler}/test_vec4_copy_propagation.cpp (100%)
rename src/{mesa/drivers/dri/i965 => intel/compiler}/test_vec4_register_coalesce.cpp (100%)
rename src/{mesa/drivers/dri/i965 => intel/compiler}/test_vf_float_conversions.cpp (100%)
diff --git a/src/intel/Makefile.am b/src/intel/Makefile.am
index 9186b5c..ae495c1 100644
--- a/src/intel/Makefile.am
+++ b/src/intel/Makefile.am
@@ -29,6 +29,7 @@ AM_CPPFLAGS = \
-I$(top_builddir)/src/compiler/nir \
-I$(top_builddir)/src/intel \
-I$(top_srcdir)/src/intel \
+ -I$(top_srcdir)/src/intel/compiler \
-I$(top_srcdir)/src/mapi \
-I$(top_srcdir)/src/mesa \
-I$(top_srcdir)/src/mesa/drivers/dri/i965 \
@@ -54,6 +55,7 @@ EXTRA_DIST =
include Makefile.blorp.am
include Makefile.common.am
+include Makefile.compiler.am
include Makefile.genxml.am
include Makefile.isl.am
diff --git a/src/intel/Makefile.compiler.am b/src/intel/Makefile.compiler.am
new file mode 100644
index 0000000..293776d
--- /dev/null
+++ b/src/intel/Makefile.compiler.am
@@ -0,0 +1,116 @@
+# Copyright 2015-2016 Intel Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+# IN THE SOFTWARE.
+
+noinst_LTLIBRARIES += compiler/libintel_compiler.la
+
+compiler_libintel_compiler_la_SOURCES = \
+ $(COMPILER_FILES) \
+ $(COMPILER_GENERATED_FILES)
+
+BUILT_SOURCES += $(COMPILER_GENERATED_FILES)
+
+compiler/brw_nir_trig_workarounds.c: compiler/brw_nir_trig_workarounds.py \
+ $(top_srcdir)/src/compiler/nir/nir_algebraic.py
+ $(MKDIR_GEN)
+ $(AM_V_GEN) PYTHONPATH=$(top_srcdir)/src/compiler/nir $(PYTHON2) $(PYTHON_FLAGS) $(srcdir)/compiler/brw_nir_trig_workarounds.py > $@ || ($(RM) $@; false)
+
+EXTRA_DIST += \
+ compiler/brw_nir_trig_workarounds.py
+
+# ----------------------------------------------------------------------------
+# Tests
+# ----------------------------------------------------------------------------
+
+TEST_LIBS = \
+ compiler/libintel_compiler.la \
+ $(I965_PERGEN_LIBS) \
+ $(top_builddir)/src/compiler/nir/libnir.la \
+ $(top_builddir)/src/util/libmesautil.la \
+ $(top_builddir)/src/intel/isl/libisl.la \
+ $(PTHREAD_LIBS) \
+ $(DLOPEN_LIBS)
+
+COMPILER_TESTS = \
+ compiler/test_fs_cmod_propagation \
+ compiler/test_fs_copy_propagation \
+ compiler/test_fs_saturate_propagation \
+ compiler/test_eu_compact \
+ compiler/test_eu_validate \
+ compiler/test_vf_float_conversions \
+ compiler/test_vec4_cmod_propagation \
+ compiler/test_vec4_copy_propagation \
+ compiler/test_vec4_register_coalesce
+
+TESTS += $(COMPILER_TESTS)
+check_PROGRAMS += $(COMPILER_TESTS)
+
+compiler_test_fs_cmod_propagation_SOURCES = \
+ compiler/test_fs_cmod_propagation.cpp
+compiler_test_fs_cmod_propagation_LDADD = \
+ $(top_builddir)/src/gtest/libgtest.la \
+ $(TEST_LIBS)
+
+compiler_test_fs_copy_propagation_SOURCES = \
+ test_fs_copy_propagation.cpp
+compiler_test_fs_copy_propagation_LDADD = \
+ $(top_builddir)/src/gtest/libgtest.la \
+ $(TEST_LIBS)
+
+compiler_test_fs_saturate_propagation_SOURCES = \
+ test_fs_saturate_propagation.cpp
+compiler_test_fs_saturate_propagation_LDADD = \
+ $(top_builddir)/src/gtest/libgtest.la \
+ $(TEST_LIBS)
+
+compiler_test_vf_float_conversions_SOURCES = \
+ test_vf_float_conversions.cpp
+compiler_test_vf_float_conversions_LDADD = \
+ $(top_builddir)/src/gtest/libgtest.la \
+ $(TEST_LIBS)
+
+compiler_test_vec4_register_coalesce_SOURCES = \
+ test_vec4_register_coalesce.cpp
+compiler_test_vec4_register_coalesce_LDADD = \
+ $(top_builddir)/src/gtest/libgtest.la \
+ $(TEST_LIBS)
+
+compiler_test_vec4_copy_propagation_SOURCES = \
+ test_vec4_copy_propagation.cpp
+compiler_test_vec4_copy_propagation_LDADD = \
+ $(top_builddir)/src/gtest/libgtest.la \
+ $(TEST_LIBS)
+
+compiler_test_vec4_cmod_propagation_SOURCES = \
+ test_vec4_cmod_propagation.cpp
+compiler_test_vec4_cmod_propagation_LDADD = \
+ $(top_builddir)/src/gtest/libgtest.la \
+ $(TEST_LIBS)
+
+compiler_test_eu_compact_SOURCES = \
+ test_eu_compact.c
+nodist_EXTRA_compiler_test_eu_compact_SOURCES = dummy.cpp
+compiler_test_eu_compact_LDADD = $(TEST_LIBS)
+
+compiler_test_eu_validate_SOURCES = \
+ test_eu_validate.cpp
+compiler_test_eu_validate_LDADD = \
+ $(top_builddir)/src/gtest/libgtest.la \
+ $(TEST_LIBS)
diff --git a/src/intel/Makefile.sources b/src/intel/Makefile.sources
index be6bdef..224a02e 100644
--- a/src/intel/Makefile.sources
+++ b/src/intel/Makefile.sources
@@ -14,6 +14,95 @@ COMMON_FILES = \
common/gen_urb_config.c \
common/gen_sample_positions.h
+COMPILER_FILES = \
+ compiler/brw_cfg.cpp \
+ compiler/brw_cfg.h \
+ compiler/brw_compiler.c \
+ compiler/brw_compiler.h \
+ compiler/brw_dead_control_flow.cpp \
+ compiler/brw_dead_control_flow.h \
+ compiler/brw_defines.h \
+ compiler/brw_disasm.c \
+ compiler/brw_eu.c \
+ compiler/brw_eu_compact.c \
+ compiler/brw_eu_emit.c \
+ compiler/brw_eu.h \
+ compiler/brw_eu_util.c \
+ compiler/brw_eu_validate.c \
+ compiler/brw_fs_builder.h \
+ compiler/brw_fs_cmod_propagation.cpp \
+ compiler/brw_fs_combine_constants.cpp \
+ compiler/brw_fs_copy_propagation.cpp \
+ compiler/brw_fs.cpp \
+ compiler/brw_fs_cse.cpp \
+ compiler/brw_fs_dead_code_eliminate.cpp \
+ compiler/brw_fs_generator.cpp \
+ compiler/brw_fs.h \
+ compiler/brw_fs_live_variables.cpp \
+ compiler/brw_fs_live_variables.h \
+ compiler/brw_fs_lower_d2x.cpp \
+ compiler/brw_fs_lower_pack.cpp \
+ compiler/brw_fs_nir.cpp \
+ compiler/brw_fs_reg_allocate.cpp \
+ compiler/brw_fs_register_coalesce.cpp \
+ compiler/brw_fs_saturate_propagation.cpp \
+ compiler/brw_fs_sel_peephole.cpp \
+ compiler/brw_fs_surface_builder.cpp \
+ compiler/brw_fs_surface_builder.h \
+ compiler/brw_fs_validate.cpp \
+ compiler/brw_fs_visitor.cpp \
+ compiler/brw_inst.h \
+ compiler/brw_interpolation_map.c \
+ compiler/brw_ir_allocator.h \
+ compiler/brw_ir_fs.h \
+ compiler/brw_ir_vec4.h \
+ compiler/brw_nir.h \
+ compiler/brw_nir.c \
+ compiler/brw_nir_analyze_boolean_resolves.c \
+ compiler/brw_nir_attribute_workarounds.c \
+ compiler/brw_nir_intrinsics.c \
+ compiler/brw_nir_opt_peephole_ffma.c \
+ compiler/brw_nir_tcs_workarounds.c \
+ compiler/brw_packed_float.c \
+ compiler/brw_predicated_break.cpp \
+ compiler/brw_reg.h \
+ compiler/brw_schedule_instructions.cpp \
+ compiler/brw_shader.cpp \
+ compiler/brw_shader.h \
+ compiler/brw_vec4_builder.h \
+ compiler/brw_vec4_cmod_propagation.cpp \
+ compiler/brw_vec4_copy_propagation.cpp \
+ compiler/brw_vec4.cpp \
+ compiler/brw_vec4_cse.cpp \
+ compiler/brw_vec4_dead_code_eliminate.cpp \
+ compiler/brw_vec4_generator.cpp \
+ compiler/brw_vec4_gs_visitor.cpp \
+ compiler/brw_vec4_gs_visitor.h \
+ compiler/brw_vec4.h \
+ compiler/brw_vec4_live_variables.cpp \
+ compiler/brw_vec4_live_variables.h \
+ compiler/brw_vec4_nir.cpp \
+ compiler/brw_vec4_gs_nir.cpp \
+ compiler/brw_vec4_reg_allocate.cpp \
+ compiler/brw_vec4_surface_builder.cpp \
+ compiler/brw_vec4_surface_builder.h \
+ compiler/brw_vec4_tcs.cpp \
+ compiler/brw_vec4_tcs.h \
+ compiler/brw_vec4_tes.cpp \
+ compiler/brw_vec4_tes.h \
+ compiler/brw_vec4_visitor.cpp \
+ compiler/brw_vec4_vs_visitor.cpp \
+ compiler/brw_vec4_vs_visitor.h \
+ compiler/brw_vue_map.c \
+ compiler/brw_wm_iz.cpp \
+ compiler/gen6_gs_visitor.cpp \
+ compiler/gen6_gs_visitor.h \
+ compiler/intel_asm_annotation.c \
+ compiler/intel_asm_annotation.h
+
+COMPILER_GENERATED_FILES = \
+ compiler/brw_nir_trig_workarounds.c
+
GENXML_GENERATED_FILES = \
genxml/gen4_pack.h \
genxml/gen45_pack.h \
diff --git a/src/intel/compiler/.gitignore b/src/intel/compiler/.gitignore
new file mode 100644
index 0000000..4ac946a
--- /dev/null
+++ b/src/intel/compiler/.gitignore
@@ -0,0 +1 @@
+brw_nir_trig_workarounds.c
diff --git a/src/mesa/drivers/dri/i965/brw_cfg.cpp b/src/intel/compiler/brw_cfg.cpp
similarity index 100%
rename from src/mesa/drivers/dri/i965/brw_cfg.cpp
rename to src/intel/compiler/brw_cfg.cpp
diff --git a/src/mesa/drivers/dri/i965/brw_cfg.h b/src/intel/compiler/brw_cfg.h
similarity index 100%
rename from src/mesa/drivers/dri/i965/brw_cfg.h
rename to src/intel/compiler/brw_cfg.h
diff --git a/src/mesa/drivers/dri/i965/brw_compiler.c b/src/intel/compiler/brw_compiler.c
similarity index 100%
rename from src/mesa/drivers/dri/i965/brw_compiler.c
rename to src/intel/compiler/brw_compiler.c
diff --git a/src/mesa/drivers/dri/i965/brw_compiler.h b/src/intel/compiler/brw_compiler.h
similarity index 100%
rename from src/mesa/drivers/dri/i965/brw_compiler.h
rename to src/intel/compiler/brw_compiler.h
diff --git a/src/mesa/drivers/dri/i965/brw_dead_control_flow.cpp b/src/intel/compiler/brw_dead_control_flow.cpp
similarity index 100%
rename from src/mesa/drivers/dri/i965/brw_dead_control_flow.cpp
rename to src/intel/compiler/brw_dead_control_flow.cpp
diff --git a/src/mesa/drivers/dri/i965/brw_dead_control_flow.h b/src/intel/compiler/brw_dead_control_flow.h
similarity index 100%
rename from src/mesa/drivers/dri/i965/brw_dead_control_flow.h
rename to src/intel/compiler/brw_dead_control_flow.h
diff --git a/src/mesa/drivers/dri/i965/brw_disasm.c b/src/intel/compiler/brw_disasm.c
similarity index 100%
rename from src/mesa/drivers/dri/i965/brw_disasm.c
rename to src/intel/compiler/brw_disasm.c
diff --git a/src/mesa/drivers/dri/i965/brw_eu.c b/src/intel/compiler/brw_eu.c
similarity index 100%
rename from src/mesa/drivers/dri/i965/brw_eu.c
rename to src/intel/compiler/brw_eu.c
diff --git a/src/mesa/drivers/dri/i965/brw_eu.h b/src/intel/compiler/brw_eu.h
similarity index 100%
rename from src/mesa/drivers/dri/i965/brw_eu.h
rename to src/intel/compiler/brw_eu.h
diff --git a/src/mesa/drivers/dri/i965/brw_eu_compact.c b/src/intel/compiler/brw_eu_compact.c
similarity index 100%
rename from src/mesa/drivers/dri/i965/brw_eu_compact.c
rename to src/intel/compiler/brw_eu_compact.c
diff --git a/src/mesa/drivers/dri/i965/brw_eu_emit.c b/src/intel/compiler/brw_eu_emit.c
similarity index 100%
rename from src/mesa/drivers/dri/i965/brw_eu_emit.c
rename to src/intel/compiler/brw_eu_emit.c
diff --git a/src/mesa/drivers/dri/i965/brw_eu_util.c b/src/intel/compiler/brw_eu_util.c
similarity index 100%
rename from src/mesa/drivers/dri/i965/brw_eu_util.c
rename to src/intel/compiler/brw_eu_util.c
diff --git a/src/mesa/drivers/dri/i965/brw_eu_validate.c b/src/intel/compiler/brw_eu_validate.c
similarity index 100%
rename from src/mesa/drivers/dri/i965/brw_eu_validate.c
rename to src/intel/compiler/brw_eu_validate.c
diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp b/src/intel/compiler/brw_fs.cpp
similarity index 100%
rename from src/mesa/drivers/dri/i965/brw_fs.cpp
rename to src/intel/compiler/brw_fs.cpp
diff --git a/src/mesa/drivers/dri/i965/brw_fs.h b/src/intel/compiler/brw_fs.h
similarity index 100%
rename from src/mesa/drivers/dri/i965/brw_fs.h
rename to src/intel/compiler/brw_fs.h
diff --git a/src/mesa/drivers/dri/i965/brw_fs_builder.h b/src/intel/compiler/brw_fs_builder.h
similarity index 100%
rename from src/mesa/drivers/dri/i965/brw_fs_builder.h
rename to src/intel/compiler/brw_fs_builder.h
diff --git a/src/mesa/drivers/dri/i965/brw_fs_cmod_propagation.cpp b/src/intel/compiler/brw_fs_cmod_propagation.cpp
similarity index 100%
rename from src/mesa/drivers/dri/i965/brw_fs_cmod_propagation.cpp
rename to src/intel/compiler/brw_fs_cmod_propagation.cpp
diff --git a/src/mesa/drivers/dri/i965/brw_fs_combine_constants.cpp b/src/intel/compiler/brw_fs_combine_constants.cpp
similarity index 100%
rename from src/mesa/drivers/dri/i965/brw_fs_combine_constants.cpp
rename to src/intel/compiler/brw_fs_combine_constants.cpp
diff --git a/src/mesa/drivers/dri/i965/brw_fs_copy_propagation.cpp b/src/intel/compiler/brw_fs_copy_propagation.cpp
similarity index 100%
rename from src/mesa/drivers/dri/i965/brw_fs_copy_propagation.cpp
rename to src/intel/compiler/brw_fs_copy_propagation.cpp
diff --git a/src/mesa/drivers/dri/i965/brw_fs_cse.cpp b/src/intel/compiler/brw_fs_cse.cpp
similarity index 100%
rename from src/mesa/drivers/dri/i965/brw_fs_cse.cpp
rename to src/intel/compiler/brw_fs_cse.cpp
diff --git a/src/mesa/drivers/dri/i965/brw_fs_dead_code_eliminate.cpp b/src/intel/compiler/brw_fs_dead_code_eliminate.cpp
similarity index 100%
rename from src/mesa/drivers/dri/i965/brw_fs_dead_code_eliminate.cpp
rename to src/intel/compiler/brw_fs_dead_code_eliminate.cpp
diff --git a/src/mesa/drivers/dri/i965/brw_fs_generator.cpp b/src/intel/compiler/brw_fs_generator.cpp
similarity index 100%
rename from src/mesa/drivers/dri/i965/brw_fs_generator.cpp
rename to src/intel/compiler/brw_fs_generator.cpp
diff --git a/src/mesa/drivers/dri/i965/brw_fs_live_variables.cpp b/src/intel/compiler/brw_fs_live_variables.cpp
similarity index 100%
rename from src/mesa/drivers/dri/i965/brw_fs_live_variables.cpp
rename to src/intel/compiler/brw_fs_live_variables.cpp
diff --git a/src/mesa/drivers/dri/i965/brw_fs_live_variables.h b/src/intel/compiler/brw_fs_live_variables.h
similarity index 100%
rename from src/mesa/drivers/dri/i965/brw_fs_live_variables.h
rename to src/intel/compiler/brw_fs_live_variables.h
diff --git a/src/mesa/drivers/dri/i965/brw_fs_lower_d2x.cpp b/src/intel/compiler/brw_fs_lower_d2x.cpp
similarity index 100%
rename from src/mesa/drivers/dri/i965/brw_fs_lower_d2x.cpp
rename to src/intel/compiler/brw_fs_lower_d2x.cpp
diff --git a/src/mesa/drivers/dri/i965/brw_fs_lower_pack.cpp b/src/intel/compiler/brw_fs_lower_pack.cpp
similarity index 100%
rename from src/mesa/drivers/dri/i965/brw_fs_lower_pack.cpp
rename to src/intel/compiler/brw_fs_lower_pack.cpp
diff --git a/src/mesa/drivers/dri/i965/brw_fs_nir.cpp b/src/intel/compiler/brw_fs_nir.cpp
similarity index 100%
rename from src/mesa/drivers/dri/i965/brw_fs_nir.cpp
rename to src/intel/compiler/brw_fs_nir.cpp
diff --git a/src/mesa/drivers/dri/i965/brw_fs_reg_allocate.cpp b/src/intel/compiler/brw_fs_reg_allocate.cpp
similarity index 100%
rename from src/mesa/drivers/dri/i965/brw_fs_reg_allocate.cpp
rename to src/intel/compiler/brw_fs_reg_allocate.cpp
diff --git a/src/mesa/drivers/dri/i965/brw_fs_register_coalesce.cpp b/src/intel/compiler/brw_fs_register_coalesce.cpp
similarity index 100%
rename from src/mesa/drivers/dri/i965/brw_fs_register_coalesce.cpp
rename to src/intel/compiler/brw_fs_register_coalesce.cpp
diff --git a/src/mesa/drivers/dri/i965/brw_fs_saturate_propagation.cpp b/src/intel/compiler/brw_fs_saturate_propagation.cpp
similarity index 100%
rename from src/mesa/drivers/dri/i965/brw_fs_saturate_propagation.cpp
rename to src/intel/compiler/brw_fs_saturate_propagation.cpp
diff --git a/src/mesa/drivers/dri/i965/brw_fs_sel_peephole.cpp b/src/intel/compiler/brw_fs_sel_peephole.cpp
similarity index 100%
rename from src/mesa/drivers/dri/i965/brw_fs_sel_peephole.cpp
rename to src/intel/compiler/brw_fs_sel_peephole.cpp
diff --git a/src/mesa/drivers/dri/i965/brw_fs_surface_builder.cpp b/src/intel/compiler/brw_fs_surface_builder.cpp
similarity index 100%
rename from src/mesa/drivers/dri/i965/brw_fs_surface_builder.cpp
rename to src/intel/compiler/brw_fs_surface_builder.cpp
diff --git a/src/mesa/drivers/dri/i965/brw_fs_surface_builder.h b/src/intel/compiler/brw_fs_surface_builder.h
similarity index 100%
rename from src/mesa/drivers/dri/i965/brw_fs_surface_builder.h
rename to src/intel/compiler/brw_fs_surface_builder.h
diff --git a/src/mesa/drivers/dri/i965/brw_fs_validate.cpp b/src/intel/compiler/brw_fs_validate.cpp
similarity index 100%
rename from src/mesa/drivers/dri/i965/brw_fs_validate.cpp
rename to src/intel/compiler/brw_fs_validate.cpp
diff --git a/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp b/src/intel/compiler/brw_fs_visitor.cpp
similarity index 100%
rename from src/mesa/drivers/dri/i965/brw_fs_visitor.cpp
rename to src/intel/compiler/brw_fs_visitor.cpp
diff --git a/src/mesa/drivers/dri/i965/brw_inst.h b/src/intel/compiler/brw_inst.h
similarity index 100%
rename from src/mesa/drivers/dri/i965/brw_inst.h
rename to src/intel/compiler/brw_inst.h
diff --git a/src/mesa/drivers/dri/i965/brw_interpolation_map.c b/src/intel/compiler/brw_interpolation_map.c
similarity index 100%
rename from src/mesa/drivers/dri/i965/brw_interpolation_map.c
rename to src/intel/compiler/brw_interpolation_map.c
diff --git a/src/mesa/drivers/dri/i965/brw_ir_allocator.h b/src/intel/compiler/brw_ir_allocator.h
similarity index 100%
rename from src/mesa/drivers/dri/i965/brw_ir_allocator.h
rename to src/intel/compiler/brw_ir_allocator.h
diff --git a/src/mesa/drivers/dri/i965/brw_ir_fs.h b/src/intel/compiler/brw_ir_fs.h
similarity index 100%
rename from src/mesa/drivers/dri/i965/brw_ir_fs.h
rename to src/intel/compiler/brw_ir_fs.h
diff --git a/src/mesa/drivers/dri/i965/brw_ir_vec4.h b/src/intel/compiler/brw_ir_vec4.h
similarity index 100%
rename from src/mesa/drivers/dri/i965/brw_ir_vec4.h
rename to src/intel/compiler/brw_ir_vec4.h
diff --git a/src/mesa/drivers/dri/i965/brw_nir.c b/src/intel/compiler/brw_nir.c
similarity index 100%
rename from src/mesa/drivers/dri/i965/brw_nir.c
rename to src/intel/compiler/brw_nir.c
diff --git a/src/mesa/drivers/dri/i965/brw_nir.h b/src/intel/compiler/brw_nir.h
similarity index 100%
rename from src/mesa/drivers/dri/i965/brw_nir.h
rename to src/intel/compiler/brw_nir.h
diff --git a/src/mesa/drivers/dri/i965/brw_nir_analyze_boolean_resolves.c b/src/intel/compiler/brw_nir_analyze_boolean_resolves.c
similarity index 100%
rename from src/mesa/drivers/dri/i965/brw_nir_analyze_boolean_resolves.c
rename to src/intel/compiler/brw_nir_analyze_boolean_resolves.c
diff --git a/src/mesa/drivers/dri/i965/brw_nir_attribute_workarounds.c b/src/intel/compiler/brw_nir_attribute_workarounds.c
similarity index 100%
rename from src/mesa/drivers/dri/i965/brw_nir_attribute_workarounds.c
rename to src/intel/compiler/brw_nir_attribute_workarounds.c
diff --git a/src/mesa/drivers/dri/i965/brw_nir_intrinsics.c b/src/intel/compiler/brw_nir_intrinsics.c
similarity index 100%
rename from src/mesa/drivers/dri/i965/brw_nir_intrinsics.c
rename to src/intel/compiler/brw_nir_intrinsics.c
diff --git a/src/mesa/drivers/dri/i965/brw_nir_opt_peephole_ffma.c b/src/intel/compiler/brw_nir_opt_peephole_ffma.c
similarity index 100%
rename from src/mesa/drivers/dri/i965/brw_nir_opt_peephole_ffma.c
rename to src/intel/compiler/brw_nir_opt_peephole_ffma.c
diff --git a/src/mesa/drivers/dri/i965/brw_nir_tcs_workarounds.c b/src/intel/compiler/brw_nir_tcs_workarounds.c
similarity index 100%
rename from src/mesa/drivers/dri/i965/brw_nir_tcs_workarounds.c
rename to src/intel/compiler/brw_nir_tcs_workarounds.c
diff --git a/src/mesa/drivers/dri/i965/brw_nir_trig_workarounds.py b/src/intel/compiler/brw_nir_trig_workarounds.py
similarity index 100%
rename from src/mesa/drivers/dri/i965/brw_nir_trig_workarounds.py
rename to src/intel/compiler/brw_nir_trig_workarounds.py
diff --git a/src/mesa/drivers/dri/i965/brw_packed_float.c b/src/intel/compiler/brw_packed_float.c
similarity index 100%
rename from src/mesa/drivers/dri/i965/brw_packed_float.c
rename to src/intel/compiler/brw_packed_float.c
diff --git a/src/mesa/drivers/dri/i965/brw_predicated_break.cpp b/src/intel/compiler/brw_predicated_break.cpp
similarity index 100%
rename from src/mesa/drivers/dri/i965/brw_predicated_break.cpp
rename to src/intel/compiler/brw_predicated_break.cpp
diff --git a/src/mesa/drivers/dri/i965/brw_reg.h b/src/intel/compiler/brw_reg.h
similarity index 100%
rename from src/mesa/drivers/dri/i965/brw_reg.h
rename to src/intel/compiler/brw_reg.h
diff --git a/src/mesa/drivers/dri/i965/brw_schedule_instructions.cpp b/src/intel/compiler/brw_schedule_instructions.cpp
similarity index 100%
rename from src/mesa/drivers/dri/i965/brw_schedule_instructions.cpp
rename to src/intel/compiler/brw_schedule_instructions.cpp
diff --git a/src/mesa/drivers/dri/i965/brw_shader.cpp b/src/intel/compiler/brw_shader.cpp
similarity index 100%
rename from src/mesa/drivers/dri/i965/brw_shader.cpp
rename to src/intel/compiler/brw_shader.cpp
diff --git a/src/mesa/drivers/dri/i965/brw_shader.h b/src/intel/compiler/brw_shader.h
similarity index 100%
rename from src/mesa/drivers/dri/i965/brw_shader.h
rename to src/intel/compiler/brw_shader.h
diff --git a/src/mesa/drivers/dri/i965/brw_vec4.cpp b/src/intel/compiler/brw_vec4.cpp
similarity index 100%
rename from src/mesa/drivers/dri/i965/brw_vec4.cpp
rename to src/intel/compiler/brw_vec4.cpp
diff --git a/src/mesa/drivers/dri/i965/brw_vec4.h b/src/intel/compiler/brw_vec4.h
similarity index 100%
rename from src/mesa/drivers/dri/i965/brw_vec4.h
rename to src/intel/compiler/brw_vec4.h
diff --git a/src/mesa/drivers/dri/i965/brw_vec4_builder.h b/src/intel/compiler/brw_vec4_builder.h
similarity index 100%
rename from src/mesa/drivers/dri/i965/brw_vec4_builder.h
rename to src/intel/compiler/brw_vec4_builder.h
diff --git a/src/mesa/drivers/dri/i965/brw_vec4_cmod_propagation.cpp b/src/intel/compiler/brw_vec4_cmod_propagation.cpp
similarity index 100%
rename from src/mesa/drivers/dri/i965/brw_vec4_cmod_propagation.cpp
rename to src/intel/compiler/brw_vec4_cmod_propagation.cpp
diff --git a/src/mesa/drivers/dri/i965/brw_vec4_copy_propagation.cpp b/src/intel/compiler/brw_vec4_copy_propagation.cpp
similarity index 100%
rename from src/mesa/drivers/dri/i965/brw_vec4_copy_propagation.cpp
rename to src/intel/compiler/brw_vec4_copy_propagation.cpp
diff --git a/src/mesa/drivers/dri/i965/brw_vec4_cse.cpp b/src/intel/compiler/brw_vec4_cse.cpp
similarity index 100%
rename from src/mesa/drivers/dri/i965/brw_vec4_cse.cpp
rename to src/intel/compiler/brw_vec4_cse.cpp
diff --git a/src/mesa/drivers/dri/i965/brw_vec4_dead_code_eliminate.cpp b/src/intel/compiler/brw_vec4_dead_code_eliminate.cpp
similarity index 100%
rename from src/mesa/drivers/dri/i965/brw_vec4_dead_code_eliminate.cpp
rename to src/intel/compiler/brw_vec4_dead_code_eliminate.cpp
diff --git a/src/mesa/drivers/dri/i965/brw_vec4_generator.cpp b/src/intel/compiler/brw_vec4_generator.cpp
similarity index 100%
rename from src/mesa/drivers/dri/i965/brw_vec4_generator.cpp
rename to src/intel/compiler/brw_vec4_generator.cpp
diff --git a/src/mesa/drivers/dri/i965/brw_vec4_gs_nir.cpp b/src/intel/compiler/brw_vec4_gs_nir.cpp
similarity index 100%
rename from src/mesa/drivers/dri/i965/brw_vec4_gs_nir.cpp
rename to src/intel/compiler/brw_vec4_gs_nir.cpp
diff --git a/src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.cpp b/src/intel/compiler/brw_vec4_gs_visitor.cpp
similarity index 100%
rename from src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.cpp
rename to src/intel/compiler/brw_vec4_gs_visitor.cpp
diff --git a/src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.h b/src/intel/compiler/brw_vec4_gs_visitor.h
similarity index 100%
rename from src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.h
rename to src/intel/compiler/brw_vec4_gs_visitor.h
diff --git a/src/mesa/drivers/dri/i965/brw_vec4_live_variables.cpp b/src/intel/compiler/brw_vec4_live_variables.cpp
similarity index 100%
rename from src/mesa/drivers/dri/i965/brw_vec4_live_variables.cpp
rename to src/intel/compiler/brw_vec4_live_variables.cpp
diff --git a/src/mesa/drivers/dri/i965/brw_vec4_live_variables.h b/src/intel/compiler/brw_vec4_live_variables.h
similarity index 100%
rename from src/mesa/drivers/dri/i965/brw_vec4_live_variables.h
rename to src/intel/compiler/brw_vec4_live_variables.h
diff --git a/src/mesa/drivers/dri/i965/brw_vec4_nir.cpp b/src/intel/compiler/brw_vec4_nir.cpp
similarity index 100%
rename from src/mesa/drivers/dri/i965/brw_vec4_nir.cpp
rename to src/intel/compiler/brw_vec4_nir.cpp
diff --git a/src/mesa/drivers/dri/i965/brw_vec4_reg_allocate.cpp b/src/intel/compiler/brw_vec4_reg_allocate.cpp
similarity index 100%
rename from src/mesa/drivers/dri/i965/brw_vec4_reg_allocate.cpp
rename to src/intel/compiler/brw_vec4_reg_allocate.cpp
diff --git a/src/mesa/drivers/dri/i965/brw_vec4_surface_builder.cpp b/src/intel/compiler/brw_vec4_surface_builder.cpp
similarity index 100%
rename from src/mesa/drivers/dri/i965/brw_vec4_surface_builder.cpp
rename to src/intel/compiler/brw_vec4_surface_builder.cpp
diff --git a/src/mesa/drivers/dri/i965/brw_vec4_surface_builder.h b/src/intel/compiler/brw_vec4_surface_builder.h
similarity index 100%
rename from src/mesa/drivers/dri/i965/brw_vec4_surface_builder.h
rename to src/intel/compiler/brw_vec4_surface_builder.h
diff --git a/src/mesa/drivers/dri/i965/brw_vec4_tcs.cpp b/src/intel/compiler/brw_vec4_tcs.cpp
similarity index 100%
rename from src/mesa/drivers/dri/i965/brw_vec4_tcs.cpp
rename to src/intel/compiler/brw_vec4_tcs.cpp
diff --git a/src/mesa/drivers/dri/i965/brw_vec4_tcs.h b/src/intel/compiler/brw_vec4_tcs.h
similarity index 100%
rename from src/mesa/drivers/dri/i965/brw_vec4_tcs.h
rename to src/intel/compiler/brw_vec4_tcs.h
diff --git a/src/mesa/drivers/dri/i965/brw_vec4_tes.cpp b/src/intel/compiler/brw_vec4_tes.cpp
similarity index 100%
rename from src/mesa/drivers/dri/i965/brw_vec4_tes.cpp
rename to src/intel/compiler/brw_vec4_tes.cpp
diff --git a/src/mesa/drivers/dri/i965/brw_vec4_tes.h b/src/intel/compiler/brw_vec4_tes.h
similarity index 100%
rename from src/mesa/drivers/dri/i965/brw_vec4_tes.h
rename to src/intel/compiler/brw_vec4_tes.h
diff --git a/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp b/src/intel/compiler/brw_vec4_visitor.cpp
similarity index 100%
rename from src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp
rename to src/intel/compiler/brw_vec4_visitor.cpp
diff --git a/src/mesa/drivers/dri/i965/brw_vec4_vs_visitor.cpp b/src/intel/compiler/brw_vec4_vs_visitor.cpp
similarity index 100%
rename from src/mesa/drivers/dri/i965/brw_vec4_vs_visitor.cpp
rename to src/intel/compiler/brw_vec4_vs_visitor.cpp
diff --git a/src/mesa/drivers/dri/i965/brw_vue_map.c b/src/intel/compiler/brw_vue_map.c
similarity index 100%
rename from src/mesa/drivers/dri/i965/brw_vue_map.c
rename to src/intel/compiler/brw_vue_map.c
diff --git a/src/mesa/drivers/dri/i965/brw_wm_iz.cpp b/src/intel/compiler/brw_wm_iz.cpp
similarity index 100%
rename from src/mesa/drivers/dri/i965/brw_wm_iz.cpp
rename to src/intel/compiler/brw_wm_iz.cpp
diff --git a/src/mesa/drivers/dri/i965/gen6_gs_visitor.cpp b/src/intel/compiler/gen6_gs_visitor.cpp
similarity index 100%
rename from src/mesa/drivers/dri/i965/gen6_gs_visitor.cpp
rename to src/intel/compiler/gen6_gs_visitor.cpp
diff --git a/src/mesa/drivers/dri/i965/gen6_gs_visitor.h b/src/intel/compiler/gen6_gs_visitor.h
similarity index 100%
rename from src/mesa/drivers/dri/i965/gen6_gs_visitor.h
rename to src/intel/compiler/gen6_gs_visitor.h
diff --git a/src/mesa/drivers/dri/i965/intel_asm_annotation.c b/src/intel/compiler/intel_asm_annotation.c
similarity index 100%
rename from src/mesa/drivers/dri/i965/intel_asm_annotation.c
rename to src/intel/compiler/intel_asm_annotation.c
diff --git a/src/mesa/drivers/dri/i965/test_eu_compact.c b/src/intel/compiler/test_eu_compact.c
similarity index 100%
rename from src/mesa/drivers/dri/i965/test_eu_compact.c
rename to src/intel/compiler/test_eu_compact.c
diff --git a/src/mesa/drivers/dri/i965/test_eu_validate.cpp b/src/intel/compiler/test_eu_validate.cpp
similarity index 100%
rename from src/mesa/drivers/dri/i965/test_eu_validate.cpp
rename to src/intel/compiler/test_eu_validate.cpp
diff --git a/src/mesa/drivers/dri/i965/test_fs_cmod_propagation.cpp b/src/intel/compiler/test_fs_cmod_propagation.cpp
similarity index 100%
rename from src/mesa/drivers/dri/i965/test_fs_cmod_propagation.cpp
rename to src/intel/compiler/test_fs_cmod_propagation.cpp
diff --git a/src/mesa/drivers/dri/i965/test_fs_copy_propagation.cpp b/src/intel/compiler/test_fs_copy_propagation.cpp
similarity index 100%
rename from src/mesa/drivers/dri/i965/test_fs_copy_propagation.cpp
rename to src/intel/compiler/test_fs_copy_propagation.cpp
diff --git a/src/mesa/drivers/dri/i965/test_fs_saturate_propagation.cpp b/src/intel/compiler/test_fs_saturate_propagation.cpp
similarity index 100%
rename from src/mesa/drivers/dri/i965/test_fs_saturate_propagation.cpp
rename to src/intel/compiler/test_fs_saturate_propagation.cpp
diff --git a/src/mesa/drivers/dri/i965/test_vec4_cmod_propagation.cpp b/src/intel/compiler/test_vec4_cmod_propagation.cpp
similarity index 100%
rename from src/mesa/drivers/dri/i965/test_vec4_cmod_propagation.cpp
rename to src/intel/compiler/test_vec4_cmod_propagation.cpp
diff --git a/src/mesa/drivers/dri/i965/test_vec4_copy_propagation.cpp b/src/intel/compiler/test_vec4_copy_propagation.cpp
similarity index 100%
rename from src/mesa/drivers/dri/i965/test_vec4_copy_propagation.cpp
rename to src/intel/compiler/test_vec4_copy_propagation.cpp
diff --git a/src/mesa/drivers/dri/i965/test_vec4_register_coalesce.cpp b/src/intel/compiler/test_vec4_register_coalesce.cpp
similarity index 100%
rename from src/mesa/drivers/dri/i965/test_vec4_register_coalesce.cpp
rename to src/intel/compiler/test_vec4_register_coalesce.cpp
diff --git a/src/mesa/drivers/dri/i965/test_vf_float_conversions.cpp b/src/intel/compiler/test_vf_float_conversions.cpp
similarity index 100%
rename from src/mesa/drivers/dri/i965/test_vf_float_conversions.cpp
rename to src/intel/compiler/test_vf_float_conversions.cpp
diff --git a/src/mesa/drivers/dri/i965/Makefile.am b/src/mesa/drivers/dri/i965/Makefile.am
index f87fa67..d93e4b8 100644
--- a/src/mesa/drivers/dri/i965/Makefile.am
+++ b/src/mesa/drivers/dri/i965/Makefile.am
@@ -73,7 +73,6 @@ libi965_gen9_la_CFLAGS = $(AM_CFLAGS) -DGEN_VERSIONx10=90
noinst_LTLIBRARIES = \
libi965_dri.la \
- libi965_compiler.la \
$(I965_PERGEN_LIBS)
libi965_dri_la_SOURCES = $(i965_FILES)
@@ -84,88 +83,3 @@ libi965_dri_la_LIBADD = \
$(top_builddir)/src/intel/blorp/libblorp.la \
$(I965_PERGEN_LIBS) \
$(INTEL_LIBS)
-
-libi965_compiler_la_SOURCES = \
- $(i965_compiler_FILES) \
- $(i965_compiler_GENERATED_FILES)
-
-BUILT_SOURCES = $(i965_compiler_GENERATED_FILES)
-CLEANFILES = $(BUILT_SOURCES)
-
-EXTRA_DIST = \
- brw_nir_trig_workarounds.py
-
-TEST_LIBS = \
- libi965_compiler.la \
- $(I965_PERGEN_LIBS) \
- $(top_builddir)/src/compiler/nir/libnir.la \
- $(top_builddir)/src/util/libmesautil.la \
- $(top_builddir)/src/intel/isl/libisl.la \
- $(PTHREAD_LIBS) \
- $(DLOPEN_LIBS)
-
-TESTS = \
- test_fs_cmod_propagation \
- test_fs_copy_propagation \
- test_fs_saturate_propagation \
- test_eu_compact \
- test_eu_validate \
- test_vf_float_conversions \
- test_vec4_cmod_propagation \
- test_vec4_copy_propagation \
- test_vec4_register_coalesce
-
-check_PROGRAMS = $(TESTS)
-
-test_fs_cmod_propagation_SOURCES = \
- test_fs_cmod_propagation.cpp
-test_fs_cmod_propagation_LDADD = \
- $(top_builddir)/src/gtest/libgtest.la \
- $(TEST_LIBS)
-
-test_fs_copy_propagation_SOURCES = \
- test_fs_copy_propagation.cpp
-test_fs_copy_propagation_LDADD = \
- $(top_builddir)/src/gtest/libgtest.la \
- $(TEST_LIBS)
-
-test_fs_saturate_propagation_SOURCES = \
- test_fs_saturate_propagation.cpp
-test_fs_saturate_propagation_LDADD = \
- $(top_builddir)/src/gtest/libgtest.la \
- $(TEST_LIBS)
-
-test_vf_float_conversions_SOURCES = \
- test_vf_float_conversions.cpp
-test_vf_float_conversions_LDADD = \
- $(top_builddir)/src/gtest/libgtest.la \
- $(TEST_LIBS)
-
-test_vec4_register_coalesce_SOURCES = \
- test_vec4_register_coalesce.cpp
-test_vec4_register_coalesce_LDADD = \
- $(top_builddir)/src/gtest/libgtest.la \
- $(TEST_LIBS)
-
-test_vec4_copy_propagation_SOURCES = \
- test_vec4_copy_propagation.cpp
-test_vec4_copy_propagation_LDADD = \
- $(top_builddir)/src/gtest/libgtest.la \
- $(TEST_LIBS)
-
-test_vec4_cmod_propagation_SOURCES = \
- test_vec4_cmod_propagation.cpp
-test_vec4_cmod_propagation_LDADD = \
- $(top_builddir)/src/gtest/libgtest.la \
- $(TEST_LIBS)
-
-test_eu_compact_SOURCES = \
- test_eu_compact.c
-nodist_EXTRA_test_eu_compact_SOURCES = dummy.cpp
-test_eu_compact_LDADD = $(TEST_LIBS)
-
-test_eu_validate_SOURCES = \
- test_eu_validate.cpp
-test_eu_validate_LDADD = \
- $(top_builddir)/src/gtest/libgtest.la \
- $(TEST_LIBS)
diff --git a/src/mesa/drivers/dri/i965/Makefile.sources b/src/mesa/drivers/dri/i965/Makefile.sources
index 4711be0..aa7ddc5 100644
--- a/src/mesa/drivers/dri/i965/Makefile.sources
+++ b/src/mesa/drivers/dri/i965/Makefile.sources
@@ -1,96 +1,3 @@
-i965_compiler_FILES = \
- brw_cfg.cpp \
- brw_cfg.h \
- brw_compiler.c \
- brw_compiler.h \
- brw_dead_control_flow.cpp \
- brw_dead_control_flow.h \
- brw_defines.h \
- brw_disasm.c \
- brw_eu.c \
- brw_eu_compact.c \
- brw_eu_emit.c \
- brw_eu.h \
- brw_eu_util.c \
- brw_eu_validate.c \
- brw_fs_builder.h \
- brw_fs_cmod_propagation.cpp \
- brw_fs_combine_constants.cpp \
- brw_fs_copy_propagation.cpp \
- brw_fs.cpp \
- brw_fs_cse.cpp \
- brw_fs_dead_code_eliminate.cpp \
- brw_fs_generator.cpp \
- brw_fs.h \
- brw_fs_live_variables.cpp \
- brw_fs_live_variables.h \
- brw_fs_lower_d2x.cpp \
- brw_fs_lower_pack.cpp \
- brw_fs_nir.cpp \
- brw_fs_reg_allocate.cpp \
- brw_fs_register_coalesce.cpp \
- brw_fs_saturate_propagation.cpp \
- brw_fs_sel_peephole.cpp \
- brw_fs_surface_builder.cpp \
- brw_fs_surface_builder.h \
- brw_fs_validate.cpp \
- brw_fs_visitor.cpp \
- brw_inst.h \
- brw_interpolation_map.c \
- brw_ir_allocator.h \
- brw_ir_fs.h \
- brw_ir_vec4.h \
- brw_nir.h \
- brw_nir.c \
- brw_nir_analyze_boolean_resolves.c \
- brw_nir_attribute_workarounds.c \
- brw_nir_intrinsics.c \
- brw_nir_opt_peephole_ffma.c \
- brw_nir_tcs_workarounds.c \
- brw_packed_float.c \
- brw_predicated_break.cpp \
- brw_reg.h \
- brw_schedule_instructions.cpp \
- brw_shader.cpp \
- brw_shader.h \
- brw_util.c \
- brw_util.h \
- brw_vec4_builder.h \
- brw_vec4_cmod_propagation.cpp \
- brw_vec4_copy_propagation.cpp \
- brw_vec4.cpp \
- brw_vec4_cse.cpp \
- brw_vec4_dead_code_eliminate.cpp \
- brw_vec4_generator.cpp \
- brw_vec4_gs_visitor.cpp \
- brw_vec4_gs_visitor.h \
- brw_vec4.h \
- brw_vec4_live_variables.cpp \
- brw_vec4_live_variables.h \
- brw_vec4_nir.cpp \
- brw_vec4_gs_nir.cpp \
- brw_vec4_reg_allocate.cpp \
- brw_vec4_surface_builder.cpp \
- brw_vec4_surface_builder.h \
- brw_vec4_tcs.cpp \
- brw_vec4_tcs.h \
- brw_vec4_tes.cpp \
- brw_vec4_tes.h \
- brw_vec4_visitor.cpp \
- brw_vec4_vs_visitor.cpp \
- brw_vec4_vs_visitor.h \
- brw_vue_map.c \
- brw_wm_iz.cpp \
- gen6_gs_visitor.cpp \
- gen6_gs_visitor.h \
- intel_asm_annotation.c \
- intel_asm_annotation.h \
- intel_debug.c \
- intel_debug.h
-
-i965_compiler_GENERATED_FILES = \
- brw_nir_trig_workarounds.c
-
i965_FILES = \
brw_binding_tables.c \
brw_blorp.c \
--
2.5.0.400.gff86faf
More information about the mesa-dev
mailing list