projects / mesa.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
configure/swr: add KNL and SKX architecture targets
[mesa.git] / src / gallium / drivers / swr / Makefile.am
diff --git a/src/gallium/drivers/swr/Makefile.am b/src/gallium/drivers/swr/Makefile.am
index 771f1a8243953c3795e7c329c696151670ff9589..6495021457263bdbf725894c892f96bdcf295e65 100644 (file)
--- a/src/gallium/drivers/swr/Makefile.am
+++ b/src/gallium/drivers/swr/Makefile.am
@@ -26,7 +26,14 @@ AM_CXXFLAGS = $(GALLIUM_DRIVER_CFLAGS) $(SWR_CXX11_CXXFLAGS)
 
 noinst_LTLIBRARIES = libmesaswr.la
 
-libmesaswr_la_SOURCES = $(LOADER_SOURCES)
+# gen_knobs.* included here to provide driver access to swr configuration
+libmesaswr_la_SOURCES = \
+       $(CXX_SOURCES) \
+       $(COMMON_CXX_SOURCES) \
+       $(JITTER_CXX_SOURCES) \
+       rasterizer/codegen/gen_knobs.cpp \
+       rasterizer/codegen/gen_knobs.h \
+       $(LOADER_SOURCES)
 
 COMMON_CXXFLAGS = \
        -fno-strict-aliasing \
@@ -34,6 +41,7 @@ COMMON_CXXFLAGS = \
        $(LLVM_CXXFLAGS) \
        $(SWR_CXX11_CXXFLAGS) \
        -I$(builddir)/rasterizer/codegen \
+       -I$(builddir)/rasterizer/core \
        -I$(builddir)/rasterizer/jitter \
        -I$(builddir)/rasterizer/archrast \
        -I$(srcdir)/rasterizer \
@@ -42,59 +50,86 @@ COMMON_CXXFLAGS = \
        -I$(srcdir)/rasterizer/jitter \
        -I$(srcdir)/rasterizer/archrast
 
+# SWR_AVX_CXXFLAGS needed for intrinsic usage in swr api headers
+libmesaswr_la_CXXFLAGS = \
+       $(SWR_AVX_CXXFLAGS) \
+       $(COMMON_CXXFLAGS)
+
+if HAVE_SWR_AVX
+libmesaswr_la_CXXFLAGS += -DHAVE_SWR_AVX
+endif
+
+if HAVE_SWR_AVX2
+libmesaswr_la_CXXFLAGS += -DHAVE_SWR_AVX2
+endif
+
+if HAVE_SWR_KNL
+libmesaswr_la_CXXFLAGS += -DHAVE_SWR_KNL
+endif
+
+if HAVE_SWR_SKX
+libmesaswr_la_CXXFLAGS += -DHAVE_SWR_SKX
+endif
+
 COMMON_SOURCES = \
-       $(CXX_SOURCES) \
        $(ARCHRAST_CXX_SOURCES) \
        $(COMMON_CXX_SOURCES) \
        $(CORE_CXX_SOURCES) \
-       $(JITTER_CXX_SOURCES) \
        $(MEMORY_CXX_SOURCES) \
        $(BUILT_SOURCES)
 
 BUILT_SOURCES = \
-       swr_context_llvm.h \
+       gen_swr_context_llvm.h \
        rasterizer/codegen/gen_knobs.cpp \
        rasterizer/codegen/gen_knobs.h \
-       rasterizer/jitter/state_llvm.h \
+       rasterizer/jitter/gen_state_llvm.h \
+       rasterizer/jitter/gen_builder.hpp \
        rasterizer/jitter/gen_builder_x86.hpp \
-       rasterizer/archrast/gen_ar_event.h \
+       rasterizer/archrast/gen_ar_event.hpp \
        rasterizer/archrast/gen_ar_event.cpp \
-       rasterizer/archrast/gen_ar_eventhandler.h \
-       rasterizer/archrast/gen_ar_eventhandlerfile.h \
-       rasterizer/core/BackendPixelRate0.cpp
+       rasterizer/archrast/gen_ar_eventhandler.hpp \
+       rasterizer/archrast/gen_ar_eventhandlerfile.hpp \
+       rasterizer/core/backends/gen_BackendPixelRate0.cpp \
+       rasterizer/core/backends/gen_BackendPixelRate1.cpp \
+       rasterizer/core/backends/gen_BackendPixelRate2.cpp \
+       rasterizer/core/backends/gen_BackendPixelRate3.cpp \
+       rasterizer/core/backends/gen_BackendPixelRate.hpp \
+       rasterizer/core/backends/gen_rasterizer0.cpp \
+       rasterizer/core/backends/gen_rasterizer1.cpp \
+       rasterizer/core/backends/gen_rasterizer2.cpp \
+       rasterizer/core/backends/gen_rasterizer3.cpp \
+       rasterizer/core/backends/gen_rasterizer.hpp
 
 MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D)
 PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS)
-swr_context_llvm.h: rasterizer/codegen/gen_llvm_types.py swr_context.h
+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/codegen/gen_knobs.cpp: rasterizer/codegen/gen_knobs.py rasterizer/codegen/knob_defs.py rasterizer/codegen/templates/knobs_template.cpp
+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 \
-               --input $(srcdir)/rasterizer/codegen/templates/knobs_template.cpp \
                --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/knobs_template.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 \
-               --input $(srcdir)/rasterizer/codegen/templates/knobs_template.cpp \
                --output rasterizer/codegen/gen_knobs.h \
                --gen_h
 
-rasterizer/jitter/state_llvm.h: rasterizer/codegen/gen_llvm_types.py rasterizer/core/state.h
+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/gen_builder.hpp: rasterizer/codegen/gen_llvm_ir_macros.py rasterizer/codegen/templates/gen_builder_template.hpp
+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 \
@@ -102,22 +137,22 @@ rasterizer/jitter/gen_builder.hpp: rasterizer/codegen/gen_llvm_ir_macros.py rast
                --output rasterizer/jitter \
                --gen_h
 
-rasterizer/jitter/gen_builder_x86.hpp: rasterizer/codegen/gen_llvm_ir_macros.py rasterizer/codegen/templates/gen_builder_template.hpp
+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/archrast/gen_ar_event.h: rasterizer/codegen/gen_archrast.py rasterizer/codegen/templates/ar_event_h.template rasterizer/archrast/events.proto
+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.h \
+               --output rasterizer/archrast/gen_ar_event.hpp \
                --gen_event_h
 
-rasterizer/archrast/gen_ar_event.cpp: rasterizer/codegen/gen_archrast.py rasterizer/codegen/templates/ar_event_cpp.template rasterizer/archrast/events.proto
+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 \
@@ -125,66 +160,90 @@ rasterizer/archrast/gen_ar_event.cpp: rasterizer/codegen/gen_archrast.py rasteri
                --output rasterizer/archrast/gen_ar_event.cpp \
                --gen_event_cpp
 
-rasterizer/archrast/gen_ar_eventhandler.h: rasterizer/codegen/gen_archrast.py rasterizer/codegen/templates/ar_eventhandler_h.template rasterizer/archrast/events.proto
+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.h \
+               --output rasterizer/archrast/gen_ar_eventhandler.hpp \
                --gen_eventhandler_h
 
-rasterizer/archrast/gen_ar_eventhandlerfile.h: rasterizer/codegen/gen_archrast.py rasterizer/codegen/templates/ar_eventhandlerfile_h.template rasterizer/archrast/events.proto
+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.h \
+               --output rasterizer/archrast/gen_ar_eventhandlerfile.hpp \
                --gen_eventhandlerfile_h
 
+rasterizer/core/backends/gen_BackendPixelRate0.cpp \
+rasterizer/core/backends/gen_BackendPixelRate1.cpp \
+rasterizer/core/backends/gen_BackendPixelRate2.cpp \
+rasterizer/core/backends/gen_BackendPixelRate3.cpp \
+rasterizer/core/backends/gen_BackendPixelRate.hpp: \
+backend.intermediate
+
 # 5 SWR_MULTISAMPLE_TYPE_COUNT
 # 2 SWR_MSAA_SAMPLE_PATTERN_COUNT
 # 3 SWR_INPUT_COVERAGE_COUNT
 # 2 centroid
 # 2 forcedSampleCount
 # 2 canEarlyZ
-rasterizer/core/BackendPixelRate0.cpp: rasterizer/codegen/gen_backends.py rasterizer/codegen/templates/backend_template.cpp
+
+# use intermediate rule to tell make that all files can be
+# generated in one invocation of gen_backends.py (prevents
+# parallel make race condition)
+.INTERMEDIATE: backend.intermediate
+backend.intermediate: rasterizer/codegen/gen_backends.py rasterizer/codegen/templates/gen_backend.cpp rasterizer/codegen/templates/gen_header_init.hpp
        $(MKDIR_GEN)
        $(PYTHON_GEN) \
                $(srcdir)/rasterizer/codegen/gen_backends.py \
-               --outdir rasterizer/core \
+               --outdir rasterizer/core/backends \
                --dim 5 2 3 2 2 2 \
-               --split 0 \
-               --cpp
+               --numfiles 4 \
+               --cpp \
+               --hpp
 
-COMMON_LIBADD = \
-       $(top_builddir)/src/gallium/auxiliary/libgallium.la \
-       $(top_builddir)/src/mesa/libmesagallium.la \
-       $(LLVM_LIBS)
+rasterizer/core/backends/gen_rasterizer0.cpp \
+rasterizer/core/backends/gen_rasterizer1.cpp \
+rasterizer/core/backends/gen_rasterizer2.cpp \
+rasterizer/core/backends/gen_rasterizer3.cpp \
+rasterizer/core/backends/gen_rasterizer.hpp: \
+rasterizer.intermediate
+
+# 5 SWR_MULTISAMPLE_TYPE_COUNT
+# 2 CenterPattern
+# 2 Conservative
+# 3 SWR_INPUT_COVERAGE_COUNT
+# 5 STATE_VALID_TRI_EDGE_COUNT
+# 2 RasterScissorEdges
+
+# use intermediate rule to tell make that all files can be
+# generated in one invocation of gen_backends.py (prevents
+# parallel make race condition)
+.INTERMEDIATE: rasterizer.intermediate
+rasterizer.intermediate: rasterizer/codegen/gen_backends.py rasterizer/codegen/templates/gen_rasterizer.cpp rasterizer/codegen/templates/gen_header_init.hpp
+       $(MKDIR_GEN)
+       $(PYTHON_GEN) \
+               $(srcdir)/rasterizer/codegen/gen_backends.py \
+               --outdir rasterizer/core/backends \
+               --rast \
+               --dim 5 2 2 3 5 2 \
+               --numfiles 4 \
+               --cpp \
+               --hpp
 
 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
+       $(NO_UNDEFINED)
 
-CLEANFILES = \
-       rasterizer/jitter/gen_builder.hpp
+lib_LTLIBRARIES =
 
-lib_LTLIBRARIES = libswrAVX.la libswrAVX2.la
+if HAVE_SWR_AVX
+lib_LTLIBRARIES += libswrAVX.la
 
 libswrAVX_la_CXXFLAGS = \
        $(SWR_AVX_CXXFLAGS) \
@@ -194,20 +253,12 @@ libswrAVX_la_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)
-
 libswrAVX_la_LDFLAGS = \
        $(COMMON_LDFLAGS)
+endif
 
+if HAVE_SWR_AVX2
+lib_LTLIBRARIES += libswrAVX2.la
 libswrAVX2_la_CXXFLAGS = \
        $(SWR_AVX2_CXXFLAGS) \
        -DKNOB_ARCH=KNOB_ARCH_AVX2 \
@@ -216,22 +267,52 @@ libswrAVX2_la_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_LDFLAGS = \
+       $(COMMON_LDFLAGS)
+endif
 
-libswrAVX2_la_LIBADD = \
-       $(COMMON_LIBADD)
+if HAVE_SWR_KNL
+lib_LTLIBRARIES += libswrKNL.la
 
-libswrAVX2_la_LDFLAGS = \
+libswrKNL_la_CXXFLAGS = \
+       $(SWR_KNL_CXXFLAGS) \
+       -DKNOB_ARCH=KNOB_ARCH_AVX512 -DAVX512F_STRICT \
+       $(COMMON_CXXFLAGS)
+
+libswrKNL_la_SOURCES = \
+       $(COMMON_SOURCES)
+
+libswrKNL_la_LDFLAGS = \
+       $(COMMON_LDFLAGS)
+endif
+
+if HAVE_SWR_SKX
+lib_LTLIBRARIES += libswrSKX.la
+
+libswrSKX_la_CXXFLAGS = \
+       $(SWR_SKX_CXXFLAGS) \
+       -DKNOB_ARCH=KNOB_ARCH_AVX512 \
+       $(COMMON_CXXFLAGS)
+
+libswrSKX_la_SOURCES = \
+       $(COMMON_SOURCES)
+
+libswrSKX_la_LDFLAGS = \
        $(COMMON_LDFLAGS)
+endif
 
 include $(top_srcdir)/install-gallium-links.mk
 
+# Generated gen_builder.hpp is not backwards compatible. So ship only one
+# created with the oldest supported version of LLVM.
+dist-hook:
+if SWR_INVALID_LLVM_VERSION
+       @echo "*******************************************************"
+       @echo "LLVM 3.9.0 or LLVM 3.9.1 required to create the tarball"
+       @echo "*******************************************************"
+       @test
+endif
+
 EXTRA_DIST = \
        SConscript \
        rasterizer/archrast/events.proto \
@@ -239,29 +320,16 @@ EXTRA_DIST = \
        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/mako/ast.py \
-       rasterizer/codegen/mako/_ast_util.py \
-       rasterizer/codegen/mako/cache.py \
-       rasterizer/codegen/mako/cmd.py \
-       rasterizer/codegen/mako/codegen.py \
-       rasterizer/codegen/mako/compat.py \
-       rasterizer/codegen/mako/exceptions.py \
-       rasterizer/codegen/mako/filters.py \
-       rasterizer/codegen/mako/__init__.py \
-       rasterizer/codegen/mako/lexer.py \
-       rasterizer/codegen/mako/lookup.py \
-       rasterizer/codegen/mako/parsetree.py \
-       rasterizer/codegen/mako/pygen.py \
-       rasterizer/codegen/mako/pyparser.py \
-       rasterizer/codegen/mako/runtime.py \
-       rasterizer/codegen/mako/template.py \
-       rasterizer/codegen/mako/util.py \
-       rasterizer/codegen/templates/knobs_template.cpp \
-       rasterizer/codegen/templates/ar_event_h.template \
-       rasterizer/codegen/templates/ar_event_cpp.template \
-       rasterizer/codegen/templates/ar_eventhandler_h.template \
-       rasterizer/codegen/templates/ar_eventhandlerfile_h.template \
-       rasterizer/codegen/templates/backend_template.cpp \
-       rasterizer/codegen/templates/gen_builder_template.hpp
+       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_header_init.hpp \
+       rasterizer/codegen/templates/gen_knobs.cpp \
+       rasterizer/codegen/templates/gen_llvm.hpp \
+       rasterizer/codegen/templates/gen_rasterizer.cpp