intel/anv: Build gen 12.5

Reworks:
 * Jason: call gen125_init_device_state

Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7757>

src/intel/Android.vulkan.mk

@@ -189,6 +189,27 @@ LOCAL_HEADER_LIBRARIES += $(VULKAN_COMMON_HEADER_LIBRARIES)
 include $(MESA_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)
 
+#
+# libanv for gen125
+#
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := libmesa_anv_gen125
+LOCAL_MODULE_CLASS := STATIC_LIBRARIES
+
+LOCAL_SRC_FILES := $(VULKAN_GEN125_FILES)
+LOCAL_CFLAGS := -DGEN_VERSIONx10=125
+
+LOCAL_C_INCLUDES := $(VULKAN_COMMON_INCLUDES)
+
+LOCAL_STATIC_LIBRARIES := $(ANV_STATIC_LIBRARIES)
+
+LOCAL_SHARED_LIBRARIES := $(ANV_SHARED_LIBRARIES)
+LOCAL_HEADER_LIBRARIES += $(VULKAN_COMMON_HEADER_LIBRARIES)
+
+include $(MESA_COMMON_MK)
+include $(BUILD_STATIC_LIBRARY)
+
 
 #
 # libmesa_vulkan_common
@@ -293,6 +314,7 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \
 	libmesa_anv_gen9 \
 	libmesa_anv_gen11 \
 	libmesa_anv_gen12 \
+	libmesa_anv_gen125 \
 	libmesa_intel_compiler
 
 LOCAL_SHARED_LIBRARIES := $(ANV_SHARED_LIBRARIES) libz libsync liblog

src/intel/Makefile.sources

@@ -345,6 +345,10 @@ VULKAN_GEN12_FILES := \
 	vulkan/gen8_cmd_buffer.c \
 	$(VULKAN_GENX_FILES)
 
+VULKAN_GEN125_FILES := \
+	vulkan/gen8_cmd_buffer.c \
+	$(VULKAN_GENX_FILES)
+
 GEN_PERF_XML_FILES = \
 	perf/oa-hsw.xml \
 	perf/oa-bdw.xml \

src/intel/vulkan/anv_blorp.c

@@ -114,7 +114,11 @@ anv_device_init_blorp(struct anv_device *device)
       device->blorp.exec = gen11_blorp_exec;
       break;
    case 12:
+      if (gen_device_info_is_12hp(&device->info)) {
+         device->blorp.exec = gen125_blorp_exec;
+      } else {
          device->blorp.exec = gen12_blorp_exec;
+      }
       break;
    default:
       unreachable("Unknown hardware generation");

src/intel/vulkan/anv_cmd_buffer.c

@@ -387,7 +387,11 @@ VkResult anv_ResetCommandBuffer(
       gen11_##func(__VA_ARGS__);                   \
       break;                                       \
    case 12:                                        \
+      if (gen_device_info_is_12hp(devinfo)) {      \
+         gen125_##func(__VA_ARGS__);               \
+      } else {                                     \
          gen12_##func(__VA_ARGS__);                \
+      }                                            \
       break;                                       \
    default:                                        \
       assert(!"Unknown hardware generation");      \

src/intel/vulkan/anv_device.c

@@ -3025,6 +3025,9 @@ VkResult anv_CreateDevice(
       result = gen11_init_device_state(device);
       break;
    case 12:
+      if (gen_device_info_is_12hp(&device->info))
+         result = gen125_init_device_state(device);
+      else
          result = gen12_init_device_state(device);
       break;
    default:

src/intel/vulkan/anv_entrypoints_gen.py

@@ -45,6 +45,7 @@ LAYERS = [
     'gen9',
     'gen11',
     'gen12',
+    'gen125',
 ]
 
 TEMPLATE_H = Template("""\
@@ -518,7 +519,11 @@ anv_resolve_device_entrypoint(const struct gen_device_info *devinfo, uint32_t in
    const struct anv_device_dispatch_table *genX_table;
    switch (devinfo->gen) {
    case 12:
+      if (gen_device_info_is_12hp(devinfo)) {
+         genX_table = &gen125_device_dispatch_table;
+      } else {
          genX_table = &gen12_device_dispatch_table;
+      }
       break;
    case 11:
       genX_table = &gen11_device_dispatch_table;

src/intel/vulkan/anv_private.h

@@ -4594,6 +4594,9 @@ VK_DEFINE_NONDISP_HANDLE_CASTS(anv_performance_configuration_intel, base,
 #  define genX(x) gen12_##x
 #  include "anv_genX.h"
 #  undef genX
+#  define genX(x) gen125_##x
+#  include "anv_genX.h"
+#  undef genX
 #endif
 
 #endif /* ANV_PRIVATE_H */

src/intel/vulkan/meson.build

@@ -79,7 +79,8 @@ anv_gen_files = files(
 )
 foreach g : [['70', ['gen7_cmd_buffer.c']], ['75', ['gen7_cmd_buffer.c']],
              ['80', ['gen8_cmd_buffer.c']], ['90', ['gen8_cmd_buffer.c']],
-             ['110', ['gen8_cmd_buffer.c']], ['120', ['gen8_cmd_buffer.c']]]
+             ['110', ['gen8_cmd_buffer.c']], ['120', ['gen8_cmd_buffer.c']],
+             ['125', ['gen8_cmd_buffer.c']]]
   _gen = g[0]
   libanv_gen_libs += static_library(
     'anv_gen@0@'.format(_gen),