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 578f15909b68009ea3586b7286408d187704be29..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 \
@@ -43,12 +50,31 @@ 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)
 
@@ -67,7 +93,12 @@ BUILT_SOURCES = \
        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_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)
@@ -173,21 +204,46 @@ backend.intermediate: rasterizer/codegen/gen_backends.py rasterizer/codegen/temp
                --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)
+       $(NO_UNDEFINED)
 
+lib_LTLIBRARIES =
 
-lib_LTLIBRARIES = libswrAVX.la libswrAVX2.la
+if HAVE_SWR_AVX
+lib_LTLIBRARIES += libswrAVX.la
 
 libswrAVX_la_CXXFLAGS = \
        $(SWR_AVX_CXXFLAGS) \
@@ -197,12 +253,12 @@ libswrAVX_la_CXXFLAGS = \
 libswrAVX_la_SOURCES = \
        $(COMMON_SOURCES)
 
-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 \
@@ -211,11 +267,39 @@ libswrAVX2_la_CXXFLAGS = \
 libswrAVX2_la_SOURCES = \
        $(COMMON_SOURCES)
 
-libswrAVX2_la_LIBADD = \
-       $(COMMON_LIBADD)
-
 libswrAVX2_la_LDFLAGS = \
        $(COMMON_LDFLAGS)
+endif
+
+if HAVE_SWR_KNL
+lib_LTLIBRARIES += libswrKNL.la
+
+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
 
@@ -247,4 +331,5 @@ EXTRA_DIST = \
        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_llvm.hpp \
+       rasterizer/codegen/templates/gen_rasterizer.cpp