From 0d9be82fe6a920749950e895d3e1f0068dc4b337 Mon Sep 17 00:00:00 2001 From: Jordan Justen Date: Wed, 7 Dec 2022 12:49:21 -0800 Subject: [PATCH] intel/genxml: Add genX_rt_pack.h Signed-off-by: Jordan Justen Reviewed-by: Lionel Landwerlin Part-of: --- src/intel/genxml/{gen_rt.xml => gen125_rt.xml} | 0 src/intel/genxml/genX_rt_pack.h | 57 ++++++++++++++++++++++++++ src/intel/genxml/meson.build | 10 +++-- src/intel/vulkan/genX_acceleration_structure.c | 2 +- src/intel/vulkan/genX_cmd_buffer.c | 2 +- src/intel/vulkan/genX_pipeline.c | 2 +- src/intel/vulkan/grl/grl_metakernel_gen.py | 2 +- src/intel/vulkan_hasvk/genX_cmd_buffer.c | 2 +- src/intel/vulkan_hasvk/genX_pipeline.c | 2 +- 9 files changed, 70 insertions(+), 9 deletions(-) rename src/intel/genxml/{gen_rt.xml => gen125_rt.xml} (100%) create mode 100644 src/intel/genxml/genX_rt_pack.h diff --git a/src/intel/genxml/gen_rt.xml b/src/intel/genxml/gen125_rt.xml similarity index 100% rename from src/intel/genxml/gen_rt.xml rename to src/intel/genxml/gen125_rt.xml diff --git a/src/intel/genxml/genX_rt_pack.h b/src/intel/genxml/genX_rt_pack.h new file mode 100644 index 0000000..0779398 --- /dev/null +++ b/src/intel/genxml/genX_rt_pack.h @@ -0,0 +1,57 @@ +/* + * Copyright © 2022 Intel Corporation + * + * 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 (including the next + * paragraph) 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. + */ + +#ifndef GENX_RT_PACK_H +#define GENX_RT_PACK_H + +#ifndef GFX_VERx10 +# error "The GFX_VERx10 macro must be defined" +#endif + +#if (GFX_VERx10 == 40) +/* No RT support for this gfx ver */ +#elif (GFX_VERx10 == 45) +/* No RT support for this gfx ver */ +#elif (GFX_VERx10 == 50) +/* No RT support for this gfx ver */ +#elif (GFX_VERx10 == 60) +/* No RT support for this gfx ver */ +#elif (GFX_VERx10 == 70) +/* No RT support for this gfx ver */ +#elif (GFX_VERx10 == 75) +/* No RT support for this gfx ver */ +#elif (GFX_VERx10 == 80) +/* No RT support for this gfx ver */ +#elif (GFX_VERx10 == 90) +/* No RT support for this gfx ver */ +#elif (GFX_VERx10 == 110) +/* No RT support for this gfx ver */ +#elif (GFX_VERx10 == 120) +/* No RT support for this gfx ver */ +#elif (GFX_VERx10 == 125) +# include "genxml/gen125_rt_pack.h" +#else +# error "Need to add a pack header include for this gen" +#endif + +#endif /* GENX_RT_PACK_H */ diff --git a/src/intel/genxml/meson.build b/src/intel/genxml/meson.build index c1c68fa..b197189 100644 --- a/src/intel/genxml/meson.build +++ b/src/intel/genxml/meson.build @@ -32,6 +32,10 @@ gen_xml_files = [ 'gen125.xml', ] +gen_xml_rt_files = [ + 'gen125_rt.xml', +] + gen_pack_header_deps = files('util.py') genX_xml_h = custom_target( @@ -83,7 +87,7 @@ genX_bits_included_symbols = [ genX_bits_h = custom_target( 'genX_bits.h', - input : ['gen_bits_header.py', gen_xml_files, 'gen_rt.xml'], + input : ['gen_bits_header.py', gen_xml_files, gen_xml_rt_files], output : 'genX_bits.h', command : [prog_python, '@INPUT@', '-o', '@OUTPUT@', '--include-symbols', ','.join(genX_bits_included_symbols)], @@ -91,7 +95,7 @@ genX_bits_h = custom_target( ) gen_xml_pack = [] -foreach f : gen_xml_files + ['gen_rt.xml'] +foreach f : gen_xml_files + gen_xml_rt_files _name = '@0@_pack.h'.format(f.split('.')[0]) gen_xml_pack += custom_target( _name, @@ -107,7 +111,7 @@ gen_pack_header_py = files('gen_pack_header.py') idep_genxml = declare_dependency(sources : [gen_xml_pack, genX_bits_h, genX_xml_h]) -foreach f : gen_xml_files + ['gen_rt.xml'] +foreach f : gen_xml_files + gen_xml_rt_files test( 'genxml sort @0@'.format(f), prog_python, diff --git a/src/intel/vulkan/genX_acceleration_structure.c b/src/intel/vulkan/genX_acceleration_structure.c index 4fe5656..e8c29b6 100644 --- a/src/intel/vulkan/genX_acceleration_structure.c +++ b/src/intel/vulkan/genX_acceleration_structure.c @@ -31,7 +31,7 @@ #include "genxml/gen_macros.h" #include "genxml/genX_pack.h" -#include "genxml/gen_rt_pack.h" +#include "genxml/genX_rt_pack.h" #if GFX_VERx10 >= 125 diff --git a/src/intel/vulkan/genX_cmd_buffer.c b/src/intel/vulkan/genX_cmd_buffer.c index 5b0132a..8e8bfea 100644 --- a/src/intel/vulkan/genX_cmd_buffer.c +++ b/src/intel/vulkan/genX_cmd_buffer.c @@ -35,7 +35,7 @@ #include "common/intel_l3_config.h" #include "genxml/gen_macros.h" #include "genxml/genX_pack.h" -#include "genxml/gen_rt_pack.h" +#include "genxml/genX_rt_pack.h" #include "common/intel_guardband.h" #include "compiler/brw_prim.h" diff --git a/src/intel/vulkan/genX_pipeline.c b/src/intel/vulkan/genX_pipeline.c index 7dc1873..280b4b9 100644 --- a/src/intel/vulkan/genX_pipeline.c +++ b/src/intel/vulkan/genX_pipeline.c @@ -25,7 +25,7 @@ #include "genxml/gen_macros.h" #include "genxml/genX_pack.h" -#include "genxml/gen_rt_pack.h" +#include "genxml/genX_rt_pack.h" #include "common/intel_l3_config.h" #include "common/intel_sample_positions.h" diff --git a/src/intel/vulkan/grl/grl_metakernel_gen.py b/src/intel/vulkan/grl/grl_metakernel_gen.py index 029ecf3..0a14113 100644 --- a/src/intel/vulkan/grl/grl_metakernel_gen.py +++ b/src/intel/vulkan/grl/grl_metakernel_gen.py @@ -866,7 +866,7 @@ C_PROLOGUE = COPYRIGHT + ''' #include "genxml/gen_macros.h" #include "genxml/genX_pack.h" -#include "genxml/gen_rt_pack.h" +#include "genxml/genX_rt_pack.h" /* We reserve : * - GPR 14 for secondary command buffer returns diff --git a/src/intel/vulkan_hasvk/genX_cmd_buffer.c b/src/intel/vulkan_hasvk/genX_cmd_buffer.c index d5aa467..141d59a 100644 --- a/src/intel/vulkan_hasvk/genX_cmd_buffer.c +++ b/src/intel/vulkan_hasvk/genX_cmd_buffer.c @@ -34,7 +34,7 @@ #include "common/intel_l3_config.h" #include "genxml/gen_macros.h" #include "genxml/genX_pack.h" -#include "genxml/gen_rt_pack.h" +#include "genxml/genX_rt_pack.h" #include "common/intel_guardband.h" #include "compiler/brw_prim.h" diff --git a/src/intel/vulkan_hasvk/genX_pipeline.c b/src/intel/vulkan_hasvk/genX_pipeline.c index c936af5..76c5249 100644 --- a/src/intel/vulkan_hasvk/genX_pipeline.c +++ b/src/intel/vulkan_hasvk/genX_pipeline.c @@ -25,7 +25,7 @@ #include "genxml/gen_macros.h" #include "genxml/genX_pack.h" -#include "genxml/gen_rt_pack.h" +#include "genxml/genX_rt_pack.h" #include "common/intel_l3_config.h" #include "common/intel_sample_positions.h" -- 2.7.4