From 1be67d610f4b3837e930532cd6636ea659bac814 Mon Sep 17 00:00:00 2001 From: Mauro Rossi Date: Sat, 20 Jun 2020 20:47:05 +0200 Subject: [PATCH] android: freedreno/ir3: simplify generated sources rules Simplification and alignment with meson's sources generation rules Changelog: - move rules from src/gallium/drivers/freedreno/Android.gen.mk to Android.ir3.mk - simplify LOCAL_GENERATED_SOURCES based on $(ir3_GENERATED_FILES) - remove includes of src/gallium/drivers/freedreno/Android.gen.mk - remove src/gallium/drivers/freedreno/Android.gen.mk Signed-off-by: Mauro Rossi Acked-by: Rob Clark Acked-by: Eric Engestrom Part-of: --- src/freedreno/Android.ir3.mk | 18 +++++++- src/freedreno/Android.mk | 1 - src/gallium/drivers/freedreno/Android.gen.mk | 46 -------------------- src/gallium/drivers/freedreno/Android.mk | 1 - 4 files changed, 17 insertions(+), 49 deletions(-) delete mode 100644 src/gallium/drivers/freedreno/Android.gen.mk diff --git a/src/freedreno/Android.ir3.mk b/src/freedreno/Android.ir3.mk index ad3625a85bb..dec251798aa 100644 --- a/src/freedreno/Android.ir3.mk +++ b/src/freedreno/Android.ir3.mk @@ -54,11 +54,19 @@ LOCAL_GENERATED_SOURCES := \ $(MESA_GEN_NIR_H) LOCAL_GENERATED_SOURCES += $(addprefix $(intermediates)/, \ - ir3/ir3_lexer.c ir3/ir3_parser.c ir3/ir3_parser.h) + $(ir3_GENERATED_FILES)) ir3_lexer_deps := \ $(MESA_TOP)/src/freedreno/ir3/ir3_lexer.l +ir3_nir_imul_deps := \ + $(MESA_TOP)/src/freedreno/ir3/ir3_nir_imul.py \ + $(MESA_TOP)/src/compiler/nir/nir_algebraic.py + +ir3_nir_trig_deps := \ + $(MESA_TOP)/src/freedreno/ir3/ir3_nir_trig.py \ + $(MESA_TOP)/src/compiler/nir/nir_algebraic.py + ir3_parser_deps := \ $(MESA_TOP)/src/freedreno/ir3/ir3_parser.y @@ -67,6 +75,14 @@ $(intermediates)/ir3/ir3_lexer.c: $(ir3_lexer_deps) @echo "Gen Header: $(PRIVATE_MODULE) <= $(notdir $(@))" $(hide) flex -o $@ $< +$(intermediates)/ir3/ir3_nir_imul.c: $(ir3_nir_imul_deps) + @mkdir -p $(dir $@) + $(hide) $(MESA_PYTHON2) $< -p $(MESA_TOP)/src/compiler/nir > $@ + +$(intermediates)/ir3/ir3_nir_trig.c: $(ir3_nir_trig_deps) + @mkdir -p $(dir $@) + $(hide) $(MESA_PYTHON2) $< -p $(MESA_TOP)/src/compiler/nir > $@ + $(intermediates)/ir3/ir3_parser.c: $(ir3_parser_deps) @mkdir -p $(dir $@) @echo "Gen Header: $(PRIVATE_MODULE) <= $(notdir $(@))" diff --git a/src/freedreno/Android.mk b/src/freedreno/Android.mk index e5889cc5b99..3d76c40f6b5 100644 --- a/src/freedreno/Android.mk +++ b/src/freedreno/Android.mk @@ -25,7 +25,6 @@ LOCAL_PATH := $(call my-dir) include $(LOCAL_PATH)/Makefile.sources -include $(MESA_TOP)/src/gallium/drivers/freedreno/Android.gen.mk include $(LOCAL_PATH)/Android.drm.mk include $(LOCAL_PATH)/Android.ir3.mk include $(LOCAL_PATH)/Android.perfcntrs.mk diff --git a/src/gallium/drivers/freedreno/Android.gen.mk b/src/gallium/drivers/freedreno/Android.gen.mk deleted file mode 100644 index b55e8d28a73..00000000000 --- a/src/gallium/drivers/freedreno/Android.gen.mk +++ /dev/null @@ -1,46 +0,0 @@ -# -# Copyright (C) 2016 Linaro, Ltd., Rob Herring -# -# 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 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. -# - -ifeq ($(LOCAL_MODULE_CLASS),) -LOCAL_MODULE_CLASS := STATIC_LIBRARIES -endif - -ir3_nir_trig_deps := \ - $(MESA_TOP)/src/freedreno/ir3/ir3_nir_trig.py \ - $(MESA_TOP)/src/compiler/nir/nir_algebraic.py - -ir3_nir_imul_deps := \ - $(MESA_TOP)/src/freedreno/ir3/ir3_nir_imul.py \ - $(MESA_TOP)/src/compiler/nir/nir_algebraic.py - -intermediates := $(call local-generated-sources-dir) - -$(intermediates)/ir3/ir3_nir_trig.c: $(ir3_nir_trig_deps) - @mkdir -p $(dir $@) - $(hide) $(MESA_PYTHON2) $< -p $(MESA_TOP)/src/compiler/nir > $@ - -$(intermediates)/ir3/ir3_nir_imul.c: $(ir3_nir_imul_deps) - @mkdir -p $(dir $@) - $(hide) $(MESA_PYTHON2) $< -p $(MESA_TOP)/src/compiler/nir > $@ - -LOCAL_GENERATED_SOURCES += $(addprefix $(intermediates)/, \ - ir3/ir3_nir_trig.c ir3/ir3_nir_imul.c) diff --git a/src/gallium/drivers/freedreno/Android.mk b/src/gallium/drivers/freedreno/Android.mk index 8ce64b56214..c41165cb248 100644 --- a/src/gallium/drivers/freedreno/Android.mk +++ b/src/gallium/drivers/freedreno/Android.mk @@ -47,7 +47,6 @@ LOCAL_SHARED_LIBRARIES := libdrm LOCAL_STATIC_LIBRARIES := libmesa_glsl libmesa_nir libfreedreno_drm libfreedreno_ir3 libfreedreno_perfcntrs libfreedreno_registers LOCAL_MODULE := libmesa_pipe_freedreno -include $(LOCAL_PATH)/Android.gen.mk include $(GALLIUM_COMMON_MK) include $(BUILD_STATIC_LIBRARY) -- 2.30.2