From 5ad00bae8b39b3731efc694d01470156b6fa7594 Mon Sep 17 00:00:00 2001 From: Caleb Callaway Date: Wed, 2 Apr 2025 21:03:03 +0000 Subject: [PATCH] intel/compiler: fix lingering i965 references Reviewed-by: Lionel Landwerlin Part-of: --- docs/envvars.rst | 4 ++-- src/intel/compiler/brw_asm_tool.c | 6 +++--- src/intel/compiler/elk/elk_asm_tool.c | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/envvars.rst b/docs/envvars.rst index 990760b746c..79718766c7b 100644 --- a/docs/envvars.rst +++ b/docs/envvars.rst @@ -781,7 +781,7 @@ Intel driver environment variables this folder and have a name formatted as ``sha1_of_assembly.bin``. The SHA-1 of a shader assembly is printed when assembly is dumped via corresponding :envvar:`INTEL_DEBUG` flag (e.g. ``vs`` for vertex shader). - A binary could be generated from a dumped assembly by ``i965_asm``. + A binary could be generated from a dumped assembly by ``brw_asm`` or ``elk_asm``. For :envvar:`INTEL_SHADER_ASM_READ_PATH` to work it is necessary to enable dumping of corresponding shader stages via :envvar:`INTEL_DEBUG`. It is advised to use ``nocompact`` flag of :envvar:`INTEL_DEBUG` when @@ -797,7 +797,7 @@ Intel driver environment variables this folder and have a name formatted as ``sha1_of_assembly.bin``. The SHA-1 of a shader assembly is printed when assembly is dumped via corresponding :envvar:`INTEL_DEBUG` flag (e.g. ``vs`` for vertex shader). - A binary could be generated from a dumped assembly by ``i965_asm``. + A binary could be generated from a dumped assembly by ``brw_asm`` or ``elk_asm``. For :envvar:`INTEL_SHADER_ASM_READ_PATH` to work it is necessary to enable dumping of corresponding shader stages via :envvar:`INTEL_DEBUG`. It is advised to use ``nocompact`` flag of :envvar:`INTEL_DEBUG` when diff --git a/src/intel/compiler/brw_asm_tool.c b/src/intel/compiler/brw_asm_tool.c index 6b2f02c3244..3cd9e8abbc1 100644 --- a/src/intel/compiler/brw_asm_tool.c +++ b/src/intel/compiler/brw_asm_tool.c @@ -54,7 +54,7 @@ print_help(const char *progname, FILE *file) " -g, --gen=platform assemble instructions for given \n" " platform (3 letter platform name)\n" "Example:\n" - " i965_asm -g kbl input.asm -t hex -o output\n", + " brw_asm -g kbl input.asm -t hex -o output\n", progname); } @@ -139,7 +139,7 @@ int main(int argc, char **argv) struct intel_device_info *devinfo = NULL; int result = EXIT_FAILURE; - const struct option i965_asm_opts[] = { + const struct option brw_asm_opts[] = { { "help", no_argument, (int *) &help, true }, { "type", required_argument, NULL, 't' }, { "gen", required_argument, NULL, 'g' }, @@ -148,7 +148,7 @@ int main(int argc, char **argv) { NULL, 0, NULL, 0 } }; - while ((c = getopt_long(argc, argv, ":t:g:o:h", i965_asm_opts, NULL)) != -1) { + while ((c = getopt_long(argc, argv, ":t:g:o:h", brw_asm_opts, NULL)) != -1) { switch (c) { case 'g': { const int id = intel_device_name_to_pci_device_id(optarg); diff --git a/src/intel/compiler/elk/elk_asm_tool.c b/src/intel/compiler/elk/elk_asm_tool.c index 61be3cfba4f..29c0734511a 100644 --- a/src/intel/compiler/elk/elk_asm_tool.c +++ b/src/intel/compiler/elk/elk_asm_tool.c @@ -56,7 +56,7 @@ print_help(const char *progname, FILE *file) " -g, --gen=platform assemble instructions for given \n" " platform (3 letter platform name)\n" "Example:\n" - " i965_asm -g kbl input.asm -t hex -o output\n", + " elk_asm -g kbl input.asm -t hex -o output\n", progname); } @@ -221,7 +221,7 @@ int main(int argc, char **argv) list_inithead(&instr_labels); list_inithead(&target_labels); - const struct option i965_asm_opts[] = { + const struct option elk_asm_opts[] = { { "help", no_argument, (int *) &help, true }, { "type", required_argument, NULL, 't' }, { "gen", required_argument, NULL, 'g' }, @@ -230,7 +230,7 @@ int main(int argc, char **argv) { NULL, 0, NULL, 0 } }; - while ((c = getopt_long(argc, argv, ":t:g:o:h", i965_asm_opts, NULL)) != -1) { + while ((c = getopt_long(argc, argv, ":t:g:o:h", elk_asm_opts, NULL)) != -1) { switch (c) { case 'g': { const int id = intel_device_name_to_pci_device_id(optarg);