fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-28 19:00:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

intel/elk: Remove compiler specific devinfo hash

Browse source 
This more coarse-grained hash information for compiler (vs. full
devinfo), used only by Iris and Anv, and relevant for more recent
platforms.  Remove it from elk.

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27563>
This commit is contained in:
Caio Oliveira 2024-02-19 11:35:17 -08:00 • committed by Marge Bot
parent 0083585fc5
commit 06b553f02c
4 changed files with 1 additions and 105 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/intel/compiler/elk/brw_compiler.c
View file

@ -283,17 +283,6 @@ brw_get_compiler_config_value(const struct brw_compiler *compiler)
return config;
}
void
brw_device_sha1(char *hex,
const struct intel_device_info *devinfo) {
struct mesa_sha1 ctx;
_mesa_sha1_init(&ctx);
brw_device_sha1_update(&ctx, devinfo);
unsigned char result[20];
_mesa_sha1_final(&ctx, result);
_mesa_sha1_format(hex, result);
}
unsigned
brw_prog_data_size(gl_shader_stage stage)
{

14
src/intel/compiler/elk/brw_compiler.h
View file

@ -1676,20 +1676,6 @@ brw_compiler_create(void *mem_ctx, const struct intel_device_info *devinfo);
uint64_t
brw_get_compiler_config_value(const struct brw_compiler *compiler);
/* Provides a string sha1 hash of all device information fields that could
* affect shader compilation.
*/
void
brw_device_sha1(char *hex, const struct intel_device_info *devinfo);
/* For callers computing their own UUID or hash. Hashes all device
* information fields that could affect shader compilation into the provided
* sha1_ctx.
*/
void
brw_device_sha1_update(struct mesa_sha1 *sha1_ctx,
const struct intel_device_info *devinfo);
unsigned
brw_prog_data_size(gl_shader_stage stage);

74
src/intel/compiler/elk/brw_device_sha1_gen_c.py
View file

@ -1,74 +0,0 @@
#!/usr/bin/env python3
COPYRIGHT = """\
/*
* Copyright 2024 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, sub license, 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 NON-INFRINGEMENT.
* IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS 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.
*/
"""
import argparse
import os
import sys
from mako.template import Template
from mako import exceptions
sys.path.append(f"{os.path.dirname(sys.argv[0])}/../../dev")
import intel_device_info
template = COPYRIGHT + """
/* DO NOT EDIT - This file generated automatically by intel_device_serialize_c.py script */
#include "dev/intel_device_info.h"
#include "brw_compiler.h"
#define SHA_UPDATE_FIELD(field) _mesa_sha1_update(ctx, &devinfo->field, sizeof(devinfo->field))
void
brw_device_sha1_update(struct mesa_sha1 *ctx,
const struct intel_device_info *devinfo) {
% for member in compiler_fields:
SHA_UPDATE_FIELD(${member.name});
% endfor
}
#undef SHA_UPDATE_FIELD
"""
def main():
"""print intel_device_serialize.c at the specified path"""
parser = argparse.ArgumentParser()
parser.add_argument('--outdir', required=True,
help='Directory to put the generated files in')
args = parser.parse_args()
path = os.path.join(args.outdir, 'brw_device_sha1_gen.c')
device_members = intel_device_info.TYPES_BY_NAME["intel_device_info"].members
compiler_fields = [field for field in device_members if field.compiler_field]
with open(path, 'w', encoding='utf-8') as f:
try:
f.write(Template(template).render(compiler_fields=compiler_fields))
except:
print(exceptions.text_error_template().render(compiler_fields=compiler_fields))
if __name__ == "__main__":
main()

7
src/intel/compiler/elk/meson.build
View file

@ -139,11 +139,6 @@ libintel_compiler_elk_files = files(
'gfx6_gs_visitor.h',
)
elk_device_sha1_gen_src = custom_target('brw_device_sha1_gen.c',
input : ['brw_device_sha1_gen_c.py', '../../dev/intel_device_info.py'],
output : ['brw_device_sha1_gen.c'],
command : [prog_python, '@INPUT0@', '--outdir', meson.current_build_dir()])
elk_nir_trig = custom_target(
'brw_nir_trig_workarounds.c',
input : 'brw_nir_trig_workarounds.py',
@ -157,7 +152,7 @@ elk_nir_trig = custom_target(
libintel_compiler_elk = static_library(
'intel_compiler_elk',
[libintel_compiler_elk_files, intel_nir_files, elk_nir_trig, ir_expression_operation_h, [elk_device_sha1_gen_src]],
[libintel_compiler_elk_files, intel_nir_files, elk_nir_trig, ir_expression_operation_h],
include_directories : [inc_include, inc_src, inc_intel],
c_args : [no_override_init_args],
gnu_symbol_visibility : 'hidden',