X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fdrivers%2Fswr%2FMakefile.am;h=0d71f52b1e6f7c5b36d56f33e9f619fe25a61eb5;hb=06690e63f76441641379d8606c28b17f83c0776e;hp=0a5ff19a74c7f82c62aa572b858155f1b0f1d95d;hpb=6423004d851bfc33aeb980548b877c1501a6e3a9;p=mesa.git

diff --git a/src/gallium/drivers/swr/Makefile.am b/src/gallium/drivers/swr/Makefile.am
index 0a5ff19a74c..0d71f52b1e6 100644
--- a/src/gallium/drivers/swr/Makefile.am
+++ b/src/gallium/drivers/swr/Makefile.am
@@ -22,24 +22,29 @@
 include Makefile.sources
 include $(top_srcdir)/src/gallium/Automake.inc
 
-AM_CXXFLAGS = $(GALLIUM_DRIVER_CFLAGS) -std=c++11
+AM_CXXFLAGS = $(GALLIUM_DRIVER_CFLAGS) $(SWR_CXX14_CXXFLAGS)
 
 noinst_LTLIBRARIES = libmesaswr.la
 
 libmesaswr_la_SOURCES = $(LOADER_SOURCES)
 
 COMMON_CXXFLAGS = \
+	-fno-strict-aliasing \
 	$(GALLIUM_DRIVER_CFLAGS) \
 	$(LLVM_CXXFLAGS) \
-	-std=c++11 \
-	-I$(builddir)/rasterizer/scripts \
+	$(SWR_CXX14_CXXFLAGS) \
+	-I$(builddir)/rasterizer/codegen \
 	-I$(builddir)/rasterizer/jitter \
+	-I$(builddir)/rasterizer/archrast \
 	-I$(srcdir)/rasterizer \
 	-I$(srcdir)/rasterizer/core \
-	-I$(srcdir)/rasterizer/jitter
+	-I$(srcdir)/rasterizer/codegen \
+	-I$(srcdir)/rasterizer/jitter \
+	-I$(srcdir)/rasterizer/archrast
 
 COMMON_SOURCES = \
 	$(CXX_SOURCES) \
+	$(ARCHRAST_CXX_SOURCES) \
 	$(COMMON_CXX_SOURCES) \
 	$(CORE_CXX_SOURCES) \
 	$(JITTER_CXX_SOURCES) \
@@ -47,76 +52,154 @@ COMMON_SOURCES = \
 	$(BUILT_SOURCES)
 
 BUILT_SOURCES = \
-	swr_context_llvm.h \
-	rasterizer/scripts/gen_knobs.cpp \
-	rasterizer/scripts/gen_knobs.h \
-	rasterizer/jitter/state_llvm.h \
-	rasterizer/jitter/builder_gen.h \
-	rasterizer/jitter/builder_gen.cpp \
-	rasterizer/jitter/builder_x86.h \
-	rasterizer/jitter/builder_x86.cpp
-
-swr_context_llvm.h: rasterizer/jitter/scripts/gen_llvm_types.py swr_context.h
-	$(PYTHON2) $(PYTHON_FLAGS) \
-		$(srcdir)/rasterizer/jitter/scripts/gen_llvm_types.py \
+	gen_swr_context_llvm.h \
+	rasterizer/codegen/gen_knobs.cpp \
+	rasterizer/codegen/gen_knobs.h \
+	rasterizer/jitter/gen_state_llvm.h \
+	rasterizer/jitter/gen_builder_x86.hpp \
+	rasterizer/archrast/gen_ar_event.hpp \
+	rasterizer/archrast/gen_ar_event.cpp \
+	rasterizer/archrast/gen_ar_eventhandler.hpp \
+	rasterizer/archrast/gen_ar_eventhandlerfile.hpp \
+	rasterizer/core/gen_BackendPixelRate0.cpp
+
+MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D)
+PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS)
+gen_swr_context_llvm.h: rasterizer/codegen/gen_llvm_types.py rasterizer/codegen/templates/gen_llvm.hpp swr_context.h
+	$(PYTHON_GEN) \
+		$(srcdir)/rasterizer/codegen/gen_llvm_types.py \
 		--input $(srcdir)/swr_context.h \
-		--output swr_context_llvm.h
+		--output ./gen_swr_context_llvm.h
 
-rasterizer/scripts/gen_knobs.cpp rasterizer/scripts/gen_knobs.h: rasterizer/scripts/gen_knobs.py rasterizer/scripts/knob_defs.py rasterizer/scripts/templates/knobs.template
-	$(PYTHON2) $(PYTHON_FLAGS) \
-		$(srcdir)/rasterizer/scripts/gen_knobs.py \
-		rasterizer/scripts
+rasterizer/codegen/gen_knobs.cpp: rasterizer/codegen/gen_knobs.py rasterizer/codegen/knob_defs.py rasterizer/codegen/templates/gen_knobs.cpp rasterizer/codegen/gen_common.py
+	$(MKDIR_GEN)
+	$(PYTHON_GEN) \
+		$(srcdir)/rasterizer/codegen/gen_knobs.py \
+		--output rasterizer/codegen/gen_knobs.cpp \
+		--gen_cpp
+
+rasterizer/codegen/gen_knobs.h: rasterizer/codegen/gen_knobs.py rasterizer/codegen/knob_defs.py rasterizer/codegen/templates/gen_knobs.cpp rasterizer/codegen/gen_common.py
+	$(MKDIR_GEN)
+	$(PYTHON_GEN) \
+		$(srcdir)/rasterizer/codegen/gen_knobs.py \
+		--output rasterizer/codegen/gen_knobs.h \
+		--gen_h
 
-rasterizer/jitter/state_llvm.h: rasterizer/jitter/scripts/gen_llvm_types.py rasterizer/core/state.h
-	$(PYTHON2) $(PYTHON_FLAGS) \
-		$(srcdir)/rasterizer/jitter/scripts/gen_llvm_types.py \
+rasterizer/jitter/gen_state_llvm.h: rasterizer/codegen/gen_llvm_types.py rasterizer/codegen/templates/gen_llvm.hpp rasterizer/core/state.h rasterizer/codegen/gen_common.py
+	$(MKDIR_GEN)
+	$(PYTHON_GEN) \
+		$(srcdir)/rasterizer/codegen/gen_llvm_types.py \
 		--input $(srcdir)/rasterizer/core/state.h \
-		--output rasterizer/jitter/state_llvm.h
+		--output rasterizer/jitter/gen_state_llvm.h
 
-rasterizer/jitter/builder_gen.h: rasterizer/jitter/scripts/gen_llvm_ir_macros.py $(LLVM_INCLUDEDIR)/llvm/IR/IRBuilder.h
-	$(PYTHON2) $(PYTHON_FLAGS) \
-		$(srcdir)/rasterizer/jitter/scripts/gen_llvm_ir_macros.py \
+rasterizer/jitter/gen_builder.hpp: rasterizer/codegen/gen_llvm_ir_macros.py rasterizer/codegen/templates/gen_builder.hpp rasterizer/codegen/gen_common.py
+	$(MKDIR_GEN)
+	$(PYTHON_GEN) \
+		$(srcdir)/rasterizer/codegen/gen_llvm_ir_macros.py \
 		--input $(LLVM_INCLUDEDIR)/llvm/IR/IRBuilder.h \
-		--output rasterizer/jitter/builder_gen.h \
+		--output rasterizer/jitter \
 		--gen_h
 
-rasterizer/jitter/builder_gen.cpp: rasterizer/jitter/scripts/gen_llvm_ir_macros.py $(LLVM_INCLUDEDIR)/llvm/IR/IRBuilder.h
-	$(PYTHON2) $(PYTHON_FLAGS) \
-		$(srcdir)/rasterizer/jitter/scripts/gen_llvm_ir_macros.py \
-		--input $(LLVM_INCLUDEDIR)/llvm/IR/IRBuilder.h \
-		--output rasterizer/jitter/builder_gen.cpp \
-		--gen_cpp
-
-rasterizer/jitter/builder_x86.h: rasterizer/jitter/scripts/gen_llvm_ir_macros.py
-	$(PYTHON2) $(PYTHON_FLAGS) \
-		$(srcdir)/rasterizer/jitter/scripts/gen_llvm_ir_macros.py \
-		--output rasterizer/jitter/builder_x86.h \
+rasterizer/jitter/gen_builder_x86.hpp: rasterizer/codegen/gen_llvm_ir_macros.py rasterizer/codegen/templates/gen_builder.hpp rasterizer/codegen/gen_common.py
+	$(MKDIR_GEN)
+	$(PYTHON_GEN) \
+		$(srcdir)/rasterizer/codegen/gen_llvm_ir_macros.py \
+		--output rasterizer/jitter \
 		--gen_x86_h
 
-rasterizer/jitter/builder_x86.cpp: rasterizer/jitter/scripts/gen_llvm_ir_macros.py
-	$(PYTHON2) $(PYTHON_FLAGS) \
-		$(srcdir)/rasterizer/jitter/scripts/gen_llvm_ir_macros.py \
-		--output rasterizer/jitter/builder_x86.cpp \
-		--gen_x86_cpp
-
+rasterizer/archrast/gen_ar_event.hpp: rasterizer/codegen/gen_archrast.py rasterizer/codegen/templates/gen_ar_event.hpp rasterizer/archrast/events.proto rasterizer/codegen/gen_common.py
+	$(MKDIR_GEN)
+	$(PYTHON_GEN) \
+		$(srcdir)/rasterizer/codegen/gen_archrast.py \
+		--proto $(srcdir)/rasterizer/archrast/events.proto \
+		--output rasterizer/archrast/gen_ar_event.hpp \
+		--gen_event_h
+
+rasterizer/archrast/gen_ar_event.cpp: rasterizer/codegen/gen_archrast.py rasterizer/codegen/templates/gen_ar_event.cpp rasterizer/archrast/events.proto rasterizer/codegen/gen_common.py
+	$(MKDIR_GEN)
+	$(PYTHON_GEN) \
+		$(srcdir)/rasterizer/codegen/gen_archrast.py \
+		--proto $(srcdir)/rasterizer/archrast/events.proto \
+		--output rasterizer/archrast/gen_ar_event.cpp \
+		--gen_event_cpp
+
+rasterizer/archrast/gen_ar_eventhandler.hpp: rasterizer/codegen/gen_archrast.py rasterizer/codegen/templates/gen_ar_eventhandler.hpp rasterizer/archrast/events.proto rasterizer/codegen/gen_common.py
+	$(MKDIR_GEN)
+	$(PYTHON_GEN) \
+		$(srcdir)/rasterizer/codegen/gen_archrast.py \
+		--proto $(srcdir)/rasterizer/archrast/events.proto \
+		--output rasterizer/archrast/gen_ar_eventhandler.hpp \
+		--gen_eventhandler_h
+
+rasterizer/archrast/gen_ar_eventhandlerfile.hpp: rasterizer/codegen/gen_archrast.py rasterizer/codegen/templates/gen_ar_eventhandlerfile.hpp rasterizer/archrast/events.proto rasterizer/codegen/gen_common.py
+	$(MKDIR_GEN)
+	$(PYTHON_GEN) \
+		$(srcdir)/rasterizer/codegen/gen_archrast.py \
+		--proto $(srcdir)/rasterizer/archrast/events.proto \
+		--output rasterizer/archrast/gen_ar_eventhandlerfile.hpp \
+		--gen_eventhandlerfile_h
+
+# 5 SWR_MULTISAMPLE_TYPE_COUNT
+# 2 SWR_MSAA_SAMPLE_PATTERN_COUNT
+# 3 SWR_INPUT_COVERAGE_COUNT
+# 2 centroid
+# 2 forcedSampleCount
+# 2 canEarlyZ
+rasterizer/core/gen_BackendPixelRate0.cpp: rasterizer/codegen/gen_backends.py rasterizer/codegen/templates/gen_backend.cpp
+	$(MKDIR_GEN)
+	$(PYTHON_GEN) \
+		$(srcdir)/rasterizer/codegen/gen_backends.py \
+		--outdir rasterizer/core \
+		--dim 5 2 3 2 2 2 \
+		--split 0 \
+		--cpp
 
 COMMON_LIBADD = \
 	$(top_builddir)/src/gallium/auxiliary/libgallium.la \
 	$(top_builddir)/src/mesa/libmesagallium.la \
 	$(LLVM_LIBS)
 
-COMMON_LDFLAGS = $(LLVM_LDFLAGS)
+COMMON_LDFLAGS = \
+	-shared \
+	-module \
+	-no-undefined \
+	$(GC_SECTIONS) \
+	$(NO_UNDEFINED) \
+	$(LLVM_LDFLAGS)
+
+
+# XXX: As we cannot use BUILT_SOURCES (the files will end up in the dist
+# tarball) just annotate the dependency directly.
+# As the single direct user of gen_builder.hpp is a header (builder.h) trace all
+# the translusive users (one that use the latter header).
+rasterizer/jitter/blend_jit.cpp: rasterizer/jitter/gen_builder.hpp
+rasterizer/jitter/builder.cpp: rasterizer/jitter/gen_builder.hpp
+rasterizer/jitter/builder_misc.cpp: rasterizer/jitter/gen_builder.hpp
+rasterizer/jitter/fetch_jit.cpp: rasterizer/jitter/gen_builder.hpp
+rasterizer/jitter/streamout_jit.cpp: rasterizer/jitter/gen_builder.hpp
+swr_shader.cpp: rasterizer/jitter/gen_builder.hpp
+
+CLEANFILES = \
+	rasterizer/jitter/gen_builder.hpp
 
 lib_LTLIBRARIES = libswrAVX.la libswrAVX2.la
 
 libswrAVX_la_CXXFLAGS = \
-	-march=core-avx-i \
+	$(SWR_AVX_CXXFLAGS) \
 	-DKNOB_ARCH=KNOB_ARCH_AVX \
 	$(COMMON_CXXFLAGS)
 
 libswrAVX_la_SOURCES = \
 	$(COMMON_SOURCES)
 
+# XXX: Don't ship these generated sources for now, since they are specific
+# to the LLVM version they are generated from. Thus a release tarball
+# containing the said files, generated against eg. LLVM 3.8 will fail to build
+# on systems with other versions of LLVM eg. 3.7 or 3.6.
+# Move these back to BUILT_SOURCES once that is resolved.
+nodist_libswrAVX_la_SOURCES = \
+	rasterizer/jitter/gen_builder.hpp
+
 libswrAVX_la_LIBADD = \
 	$(COMMON_LIBADD)
 
@@ -124,13 +207,21 @@ libswrAVX_la_LDFLAGS = \
 	$(COMMON_LDFLAGS)
 
 libswrAVX2_la_CXXFLAGS = \
-	-march=core-avx2 \
+	$(SWR_AVX2_CXXFLAGS) \
 	-DKNOB_ARCH=KNOB_ARCH_AVX2 \
 	$(COMMON_CXXFLAGS)
 
 libswrAVX2_la_SOURCES = \
 	$(COMMON_SOURCES)
 
+# XXX: Don't ship these generated sources for now, since they are specific
+# to the LLVM version they are generated from. Thus a release tarball
+# containing the said files, generated against eg. LLVM 3.8 will fail to build
+# on systems with other versions of LLVM eg. 3.7 or 3.6.
+# Move these back to BUILT_SOURCES once that is resolved.
+nodist_libswrAVX2_la_SOURCES = \
+	rasterizer/jitter/gen_builder.hpp
+
 libswrAVX2_la_LIBADD = \
 	$(COMMON_LIBADD)
 
@@ -138,3 +229,22 @@ libswrAVX2_la_LDFLAGS = \
 	$(COMMON_LDFLAGS)
 
 include $(top_srcdir)/install-gallium-links.mk
+
+EXTRA_DIST = \
+	SConscript \
+	rasterizer/archrast/events.proto \
+	rasterizer/codegen/gen_llvm_ir_macros.py \
+	rasterizer/codegen/gen_llvm_types.py \
+	rasterizer/codegen/gen_archrast.py \
+	rasterizer/codegen/gen_backends.py \
+	rasterizer/codegen/gen_common.py \
+	rasterizer/codegen/gen_knobs.py \
+	rasterizer/codegen/knob_defs.py \
+	rasterizer/codegen/templates/gen_ar_event.cpp \
+	rasterizer/codegen/templates/gen_ar_event.hpp \
+	rasterizer/codegen/templates/gen_ar_eventhandler.hpp \
+	rasterizer/codegen/templates/gen_ar_eventhandlerfile.hpp \
+	rasterizer/codegen/templates/gen_backend.cpp \
+	rasterizer/codegen/templates/gen_builder.hpp \
+	rasterizer/codegen/templates/gen_knobs.cpp \
+	rasterizer/codegen/templates/gen_llvm.hpp