Mesa (master): intel: Rename GENx prefix in macros to GFXx in build files

Fri Apr 2 18:41:12 UTC 2021

Module: Mesa
Branch: master
Commit: 0cfe7e3968ac6347c15a6610c84a43b5023a98e6
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0cfe7e3968ac6347c15a6610c84a43b5023a98e6

Author: Anuj Phogat <anuj.phogat at gmail.com>
Date:   Tue Mar 30 12:22:33 2021 -0700

intel: Rename GENx prefix in macros to GFXx in build files

Commands used to do the changes:
export SEARCH_PATH="src/intel src/gallium/drivers/iris src/mesa/drivers/dri/i965"
grep -E "GEN[[:digit:]]+[[:alpha:]_]*_FILES" -rIl $SEARCH_PATH | xargs sed -ie "s/GEN$[[:digit:]]\+[[:alpha:]_]*_FILES$/GFX\1/g"

Signed-off-by: Anuj Phogat <anuj.phogat at gmail.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9936>

---

 src/intel/Android.isl.mk    | 20 ++++++++++----------
 src/intel/Android.vulkan.mk | 14 +++++++-------
 src/intel/Makefile.sources  | 34 +++++++++++++++++-----------------
 3 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/src/intel/Android.isl.mk b/src/intel/Android.isl.mk
index bc45799030d..07a8615a76a 100644
--- a/src/intel/Android.isl.mk
+++ b/src/intel/Android.isl.mk
@@ -36,7 +36,7 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := libmesa_isl_gen4
 
-LOCAL_SRC_FILES := $(ISL_GEN4_FILES)
+LOCAL_SRC_FILES := $(ISL_GFX4_FILES)
 
 LOCAL_CFLAGS := -DGFX_VERx10=40
 
@@ -55,7 +55,7 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := libmesa_isl_gen5
 
-LOCAL_SRC_FILES := $(ISL_GEN5_FILES)
+LOCAL_SRC_FILES := $(ISL_GFX5_FILES)
 
 LOCAL_CFLAGS := -DGFX_VERx10=50
 
@@ -74,7 +74,7 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := libmesa_isl_gen6
 
-LOCAL_SRC_FILES := $(ISL_GEN6_FILES)
+LOCAL_SRC_FILES := $(ISL_GFX6_FILES)
 
 LOCAL_CFLAGS := -DGFX_VERx10=60
 
@@ -93,7 +93,7 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := libmesa_isl_gen7
 
-LOCAL_SRC_FILES := $(ISL_GEN7_FILES)
+LOCAL_SRC_FILES := $(ISL_GFX7_FILES)
 
 LOCAL_CFLAGS := -DGFX_VERx10=70
 
@@ -112,7 +112,7 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := libmesa_isl_gen75
 
-LOCAL_SRC_FILES := $(ISL_GEN75_FILES)
+LOCAL_SRC_FILES := $(ISL_GFX75_FILES)
 
 LOCAL_CFLAGS := -DGFX_VERx10=75
 
@@ -131,7 +131,7 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := libmesa_isl_gen8
 
-LOCAL_SRC_FILES := $(ISL_GEN8_FILES)
+LOCAL_SRC_FILES := $(ISL_GFX8_FILES)
 
 LOCAL_CFLAGS := -DGFX_VERx10=80
 
@@ -150,7 +150,7 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := libmesa_isl_gen9
 
-LOCAL_SRC_FILES := $(ISL_GEN9_FILES)
+LOCAL_SRC_FILES := $(ISL_GFX9_FILES)
 
 LOCAL_CFLAGS := -DGFX_VERx10=90
 
@@ -169,7 +169,7 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := libmesa_isl_gen11
 
-LOCAL_SRC_FILES := $(ISL_GEN11_FILES)
+LOCAL_SRC_FILES := $(ISL_GFX11_FILES)
 
 LOCAL_CFLAGS := -DGFX_VERx10=110
 
@@ -188,7 +188,7 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := libmesa_isl_gen12
 
-LOCAL_SRC_FILES := $(ISL_GEN12_FILES)
+LOCAL_SRC_FILES := $(ISL_GFX12_FILES)
 
 LOCAL_CFLAGS := -DGFX_VERx10=120
 
@@ -207,7 +207,7 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := libmesa_isl_gen125
 
-LOCAL_SRC_FILES := $(ISL_GEN125_FILES)
+LOCAL_SRC_FILES := $(ISL_GFX125_FILES)
 
 LOCAL_CFLAGS := -DGFX_VERx10=125
 
diff --git a/src/intel/Android.vulkan.mk b/src/intel/Android.vulkan.mk
index 4a3ba96261b..76b1df35689 100644
--- a/src/intel/Android.vulkan.mk
+++ b/src/intel/Android.vulkan.mk
@@ -70,7 +70,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := libmesa_anv_gen7
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 
-LOCAL_SRC_FILES := $(VULKAN_GEN7_FILES)
+LOCAL_SRC_FILES := $(VULKAN_GFX7_FILES)
 LOCAL_CFLAGS := -DGFX_VERx10=70
 
 LOCAL_C_INCLUDES := $(VULKAN_COMMON_INCLUDES)
@@ -91,7 +91,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := libmesa_anv_gen75
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 
-LOCAL_SRC_FILES := $(VULKAN_GEN75_FILES)
+LOCAL_SRC_FILES := $(VULKAN_GFX75_FILES)
 LOCAL_CFLAGS := -DGFX_VERx10=75
 
 LOCAL_C_INCLUDES := $(VULKAN_COMMON_INCLUDES)
@@ -112,7 +112,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := libmesa_anv_gen8
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 
-LOCAL_SRC_FILES := $(VULKAN_GEN8_FILES)
+LOCAL_SRC_FILES := $(VULKAN_GFX8_FILES)
 LOCAL_CFLAGS := -DGFX_VERx10=80
 
 LOCAL_C_INCLUDES := $(VULKAN_COMMON_INCLUDES)
@@ -133,7 +133,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := libmesa_anv_gen9
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 
-LOCAL_SRC_FILES := $(VULKAN_GEN9_FILES)
+LOCAL_SRC_FILES := $(VULKAN_GFX9_FILES)
 LOCAL_CFLAGS := -DGFX_VERx10=90
 
 LOCAL_C_INCLUDES := $(VULKAN_COMMON_INCLUDES)
@@ -154,7 +154,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := libmesa_anv_gen11
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 
-LOCAL_SRC_FILES := $(VULKAN_GEN11_FILES)
+LOCAL_SRC_FILES := $(VULKAN_GFX11_FILES)
 LOCAL_CFLAGS := -DGFX_VERx10=110
 
 LOCAL_C_INCLUDES := $(VULKAN_COMMON_INCLUDES)
@@ -175,7 +175,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := libmesa_anv_gen12
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 
-LOCAL_SRC_FILES := $(VULKAN_GEN12_FILES)
+LOCAL_SRC_FILES := $(VULKAN_GFX12_FILES)
 LOCAL_CFLAGS := -DGFX_VERx10=120
 
 LOCAL_C_INCLUDES := $(VULKAN_COMMON_INCLUDES)
@@ -196,7 +196,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := libmesa_anv_gen125
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 
-LOCAL_SRC_FILES := $(VULKAN_GEN125_FILES)
+LOCAL_SRC_FILES := $(VULKAN_GFX125_FILES)
 LOCAL_CFLAGS := -DGFX_VERx10=125
 
 LOCAL_C_INCLUDES := $(VULKAN_COMMON_INCLUDES)
diff --git a/src/intel/Makefile.sources b/src/intel/Makefile.sources
index 89b1d9dcef8..50de375ca47 100644
--- a/src/intel/Makefile.sources
+++ b/src/intel/Makefile.sources
@@ -194,55 +194,55 @@ ISL_FILES = \
 	isl/isl_priv.h \
 	isl/isl_storage_image.c
 
-ISL_GEN4_FILES = \
+ISL_GFX4_FILES = \
 	isl/isl_gfx4.c \
 	isl/isl_gfx4.h \
 	isl/isl_emit_depth_stencil.c \
 	isl/isl_surface_state.c
 
-ISL_GEN5_FILES = \
+ISL_GFX5_FILES = \
 	isl/isl_emit_depth_stencil.c \
 	isl/isl_surface_state.c
 
-ISL_GEN6_FILES = \
+ISL_GFX6_FILES = \
 	isl/isl_gfx6.c \
 	isl/isl_gfx6.h \
 	isl/isl_emit_depth_stencil.c \
 	isl/isl_surface_state.c
 
-ISL_GEN7_FILES = \
+ISL_GFX7_FILES = \
 	isl/isl_gfx7.c \
 	isl/isl_gfx7.h \
 	isl/isl_emit_depth_stencil.c \
 	isl/isl_surface_state.c
 
-ISL_GEN75_FILES = \
+ISL_GFX75_FILES = \
 	isl/isl_emit_depth_stencil.c \
 	isl/isl_surface_state.c
 
-ISL_GEN8_FILES = \
+ISL_GFX8_FILES = \
 	isl/isl_gfx8.c \
 	isl/isl_gfx8.h \
 	isl/isl_emit_depth_stencil.c \
 	isl/isl_surface_state.c
 
-ISL_GEN9_FILES = \
+ISL_GFX9_FILES = \
 	isl/isl_gfx9.c \
 	isl/isl_gfx9.h \
 	isl/isl_emit_depth_stencil.c \
 	isl/isl_surface_state.c
 
-ISL_GEN11_FILES = \
+ISL_GFX11_FILES = \
 	isl/isl_emit_depth_stencil.c \
 	isl/isl_surface_state.c
 
-ISL_GEN12_FILES = \
+ISL_GFX12_FILES = \
 	isl/isl_gfx12.c \
 	isl/isl_gfx12.h \
 	isl/isl_emit_depth_stencil.c \
 	isl/isl_surface_state.c
 
-ISL_GEN125_FILES = \
+ISL_GFX125_FILES = \
 	isl/isl_emit_depth_stencil.c \
 	isl/isl_surface_state.c
 
@@ -321,31 +321,31 @@ VULKAN_GENX_FILES := \
 	vulkan/genX_query.c \
 	vulkan/genX_state.c
 
-VULKAN_GEN7_FILES := \
+VULKAN_GFX7_FILES := \
 	vulkan/gfx7_cmd_buffer.c \
 	$(VULKAN_GENX_FILES)
 
-VULKAN_GEN75_FILES := \
+VULKAN_GFX75_FILES := \
 	vulkan/gfx7_cmd_buffer.c \
 	$(VULKAN_GENX_FILES)
 
-VULKAN_GEN8_FILES := \
+VULKAN_GFX8_FILES := \
 	vulkan/gfx8_cmd_buffer.c \
 	$(VULKAN_GENX_FILES)
 
-VULKAN_GEN9_FILES := \
+VULKAN_GFX9_FILES := \
 	vulkan/gfx8_cmd_buffer.c \
 	$(VULKAN_GENX_FILES)
 
-VULKAN_GEN11_FILES := \
+VULKAN_GFX11_FILES := \
 	vulkan/gfx8_cmd_buffer.c \
 	$(VULKAN_GENX_FILES)
 
-VULKAN_GEN12_FILES := \
+VULKAN_GFX12_FILES := \
 	vulkan/gfx8_cmd_buffer.c \
 	$(VULKAN_GENX_FILES)
 
-VULKAN_GEN125_FILES := \
+VULKAN_GFX125_FILES := \
 	vulkan/gfx8_cmd_buffer.c \
 	$(VULKAN_GENX_FILES)
 

