X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fdrivers%2Fswr%2FMakefile.am;h=3390ef6b096b9a24823758803b3fb05fd8e31b44;hb=b135db5d585db1513013acfc00d1fd77d0294dd5;hp=b4317f6f5db276f19ab386105b180eafa944849e;hpb=b05b782b4343162bb3c2bb7069d8e2cb413fb6dd;p=mesa.git diff --git a/src/gallium/drivers/swr/Makefile.am b/src/gallium/drivers/swr/Makefile.am index b4317f6f5db..3390ef6b096 100644 --- a/src/gallium/drivers/swr/Makefile.am +++ b/src/gallium/drivers/swr/Makefile.am @@ -22,101 +22,249 @@ include Makefile.sources include $(top_srcdir)/src/gallium/Automake.inc -AM_CXXFLAGS = $(GALLIUM_DRIVER_CFLAGS) -std=c++11 +AM_CXXFLAGS = $(GALLIUM_DRIVER_CFLAGS) $(CXX11_CXXFLAGS) noinst_LTLIBRARIES = libmesaswr.la -libmesaswr_la_SOURCES = $(LOADER_SOURCES) +libmesaswr_la_SOURCES = \ + $(CXX_SOURCES) \ + $(JITTER_CXX_SOURCES) \ + $(LOADER_SOURCES) COMMON_CXXFLAGS = \ + -fno-strict-aliasing \ $(GALLIUM_DRIVER_CFLAGS) \ $(LLVM_CXXFLAGS) \ - -std=c++11 \ - -I$(builddir)/rasterizer/scripts \ + $(CXX11_CXXFLAGS) \ + -I$(builddir)/rasterizer/codegen \ + -I$(builddir)/rasterizer/core \ -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 + +# 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 \ - 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.hpp \ + rasterizer/jitter/gen_builder_meta.hpp \ + rasterizer/jitter/gen_builder_intrin.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/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)$(PYTHON) $(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 + $(AM_V_GEN)touch $@ -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 + $(AM_V_GEN)touch $@ -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/codegen/gen_knobs.h: rasterizer/codegen/gen_knobs.py rasterizer/codegen/knob_defs.py rasterizer/codegen/templates/gen_knobs.h rasterizer/codegen/gen_common.py + $(MKDIR_GEN) + $(PYTHON_GEN) \ + $(srcdir)/rasterizer/codegen/gen_knobs.py \ + --output rasterizer/codegen/gen_knobs.h \ + --gen_h + $(AM_V_GEN)touch $@ + +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 + $(AM_V_GEN)touch $@ -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 + $(AM_V_GEN)touch $@ -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/gen_builder_meta.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_meta_h + $(AM_V_GEN)touch $@ + +rasterizer/jitter/gen_builder_intrin.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_intrin_h + $(AM_V_GEN)touch $@ + +rasterizer/archrast/gen_ar_event.hpp: rasterizer/codegen/gen_archrast.py rasterizer/codegen/templates/gen_ar_event.hpp rasterizer/archrast/events.proto rasterizer/archrast/events_private.proto rasterizer/codegen/gen_common.py + $(MKDIR_GEN) + $(PYTHON_GEN) \ + $(srcdir)/rasterizer/codegen/gen_archrast.py \ + --proto $(srcdir)/rasterizer/archrast/events.proto \ + --proto_private $(srcdir)/rasterizer/archrast/events_private.proto \ + --output rasterizer/archrast/gen_ar_event.hpp \ + --gen_event_hpp + $(AM_V_GEN)touch $@ + +rasterizer/archrast/gen_ar_event.cpp: rasterizer/codegen/gen_archrast.py rasterizer/codegen/templates/gen_ar_event.cpp rasterizer/archrast/events.proto rasterizer/archrast/events_private.proto rasterizer/codegen/gen_common.py + $(MKDIR_GEN) + $(PYTHON_GEN) \ + $(srcdir)/rasterizer/codegen/gen_archrast.py \ + --proto $(srcdir)/rasterizer/archrast/events.proto \ + --proto_private $(srcdir)/rasterizer/archrast/events_private.proto \ + --output rasterizer/archrast/gen_ar_event.cpp \ + --gen_event_cpp + $(AM_V_GEN)touch $@ + +rasterizer/archrast/gen_ar_eventhandler.hpp: rasterizer/codegen/gen_archrast.py rasterizer/codegen/templates/gen_ar_eventhandler.hpp rasterizer/archrast/events.proto rasterizer/archrast/events_private.proto rasterizer/codegen/gen_common.py + $(MKDIR_GEN) + $(PYTHON_GEN) \ + $(srcdir)/rasterizer/codegen/gen_archrast.py \ + --proto $(srcdir)/rasterizer/archrast/events.proto \ + --proto_private $(srcdir)/rasterizer/archrast/events_private.proto \ + --output rasterizer/archrast/gen_ar_eventhandler.hpp \ + --gen_eventhandler_hpp + $(AM_V_GEN)touch $@ -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 \ - --gen_x86_h +rasterizer/archrast/gen_ar_eventhandlerfile.hpp: rasterizer/codegen/gen_archrast.py rasterizer/codegen/templates/gen_ar_eventhandlerfile.hpp rasterizer/archrast/events.proto rasterizer/archrast/events_private.proto rasterizer/codegen/gen_common.py + $(MKDIR_GEN) + $(PYTHON_GEN) \ + $(srcdir)/rasterizer/codegen/gen_archrast.py \ + --proto $(srcdir)/rasterizer/archrast/events.proto \ + --proto_private $(srcdir)/rasterizer/archrast/events_private.proto \ + --output rasterizer/archrast/gen_ar_eventhandlerfile.hpp \ + --gen_eventhandlerfile_hpp + $(AM_V_GEN)touch $@ -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/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 -COMMON_LIBADD = \ - $(top_builddir)/src/gallium/auxiliary/libgallium.la \ - $(top_builddir)/src/mesa/libmesagallium.la \ - $(LLVM_LIBS) +# 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/backends \ + --dim 5 2 3 2 2 2 \ + --numfiles 4 \ + --cpp \ + --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: \ +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) + $(LD_NO_UNDEFINED) -lib_LTLIBRARIES = libswrAVX.la libswrAVX2.la +lib_LTLIBRARIES = +if HAVE_SWR_AVX libswrAVX_la_CXXFLAGS = \ - -march=core-avx-i \ + $(PTHREAD_CFLAGS) \ + $(SWR_AVX_CXXFLAGS) \ -DKNOB_ARCH=KNOB_ARCH_AVX \ $(COMMON_CXXFLAGS) @@ -124,13 +272,16 @@ libswrAVX_la_SOURCES = \ $(COMMON_SOURCES) libswrAVX_la_LIBADD = \ - $(COMMON_LIBADD) + $(PTHREAD_LIBS) libswrAVX_la_LDFLAGS = \ $(COMMON_LDFLAGS) +endif +if HAVE_SWR_AVX2 libswrAVX2_la_CXXFLAGS = \ - -march=core-avx2 \ + $(PTHREAD_CFLAGS) \ + $(SWR_AVX2_CXXFLAGS) \ -DKNOB_ARCH=KNOB_ARCH_AVX2 \ $(COMMON_CXXFLAGS) @@ -138,33 +289,120 @@ libswrAVX2_la_SOURCES = \ $(COMMON_SOURCES) libswrAVX2_la_LIBADD = \ - $(COMMON_LIBADD) + $(PTHREAD_LIBS) libswrAVX2_la_LDFLAGS = \ $(COMMON_LDFLAGS) +endif + +if HAVE_SWR_KNL +libswrKNL_la_CXXFLAGS = \ + $(PTHREAD_CFLAGS) \ + $(SWR_KNL_CXXFLAGS) \ + -DKNOB_ARCH=KNOB_ARCH_AVX512 -DSIMD_ARCH_KNIGHTS \ + $(COMMON_CXXFLAGS) + +libswrKNL_la_SOURCES = \ + $(COMMON_SOURCES) + +libswrKNL_la_LIBADD = \ + $(PTHREAD_LIBS) + +libswrKNL_la_LDFLAGS = \ + $(COMMON_LDFLAGS) +endif + +if HAVE_SWR_SKX +libswrSKX_la_CXXFLAGS = \ + $(PTHREAD_CFLAGS) \ + $(SWR_SKX_CXXFLAGS) \ + -DKNOB_ARCH=KNOB_ARCH_AVX512 \ + $(COMMON_CXXFLAGS) + +libswrSKX_la_SOURCES = \ + $(COMMON_SOURCES) + +libswrSKX_la_LIBADD = \ + $(PTHREAD_LIBS) + +libswrSKX_la_LDFLAGS = \ + $(COMMON_LDFLAGS) +endif + +if HAVE_SWR_BUILTIN +libmesaswr_la_CXXFLAGS += -DHAVE_SWR_BUILTIN +libmesaswr_la_LIBADD = +if HAVE_SWR_AVX +noinst_LTLIBRARIES += libswrAVX.la +libmesaswr_la_LIBADD += libswrAVX.la +endif +if HAVE_SWR_AVX2 +noinst_LTLIBRARIES += libswrAVX2.la +libmesaswr_la_LIBADD += libswrAVX2.la +endif +if HAVE_SWR_KNL +noinst_LTLIBRARIES += libswrKNL.la +libmesaswr_la_LIBADD += libswrKNL.la +endif +if HAVE_SWR_SKX +noinst_LTLIBRARIES += libswrSKX.la +libmesaswr_la_LIBADD += libswrSKX.la +endif +else # !HAVE_SWR_BUILTIN +# gen_knobs.* included here to provide driver access to swr configuration +libmesaswr_la_SOURCES += \ + $(COMMON_CXX_SOURCES) \ + rasterizer/codegen/gen_knobs.cpp \ + rasterizer/codegen/gen_knobs.h +if HAVE_SWR_AVX +lib_LTLIBRARIES += libswrAVX.la +endif +if HAVE_SWR_AVX2 +lib_LTLIBRARIES += libswrAVX2.la +endif +if HAVE_SWR_KNL +lib_LTLIBRARIES += libswrKNL.la +endif +if HAVE_SWR_SKX +lib_LTLIBRARIES += libswrSKX.la +endif +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 6.0.x required to create the tarball" + @echo "*****************************************" + @test +endif + EXTRA_DIST = \ - rasterizer/jitter/scripts/gen_llvm_ir_macros.py \ - rasterizer/jitter/scripts/gen_llvm_types.py \ - rasterizer/scripts/gen_knobs.py \ - rasterizer/scripts/knob_defs.py \ - rasterizer/scripts/mako/ast.py \ - rasterizer/scripts/mako/_ast_util.py \ - rasterizer/scripts/mako/cache.py \ - rasterizer/scripts/mako/cmd.py \ - rasterizer/scripts/mako/codegen.py \ - rasterizer/scripts/mako/compat.py \ - rasterizer/scripts/mako/exceptions.py \ - rasterizer/scripts/mako/filters.py \ - rasterizer/scripts/mako/__init__.py \ - rasterizer/scripts/mako/lexer.py \ - rasterizer/scripts/mako/lookup.py \ - rasterizer/scripts/mako/parsetree.py \ - rasterizer/scripts/mako/pygen.py \ - rasterizer/scripts/mako/pyparser.py \ - rasterizer/scripts/mako/runtime.py \ - rasterizer/scripts/mako/template.py \ - rasterizer/scripts/mako/util.py \ - rasterizer/scripts/templates/knobs.template + SConscript \ + meson.build \ + rasterizer/jitter/meson.build \ + rasterizer/codegen/meson.build \ + rasterizer/core/backends/meson.build \ + rasterizer/archrast/events.proto \ + rasterizer/archrast/events_private.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_header_init.hpp \ + rasterizer/codegen/templates/gen_knobs.cpp \ + rasterizer/codegen/templates/gen_knobs.h \ + rasterizer/codegen/templates/gen_llvm.hpp \ + rasterizer/codegen/templates/gen_rasterizer.cpp