From 821ec473a862762b3e9d4004d062293fa27e102b Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Thu, 16 Nov 2017 11:43:51 -0800 Subject: [PATCH] i965: Rename intel_asm_annotation -> brw_disasm_info MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit It was the only file named intel_* in the compiler. Reviewed-by: Samuel Iglesias Gonsálvez Reviewed-by: Kenneth Graunke --- src/intel/Makefile.sources | 6 +++--- .../compiler/{intel_asm_annotation.c => brw_disasm_info.c} | 2 +- .../compiler/{intel_asm_annotation.h => brw_disasm_info.h} | 0 src/intel/compiler/brw_eu.h | 2 +- src/intel/compiler/brw_eu_compact.c | 2 +- src/intel/compiler/meson.build | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) rename src/intel/compiler/{intel_asm_annotation.c => brw_disasm_info.c} (99%) rename src/intel/compiler/{intel_asm_annotation.h => brw_disasm_info.h} (100%) diff --git a/src/intel/Makefile.sources b/src/intel/Makefile.sources index 5a09e6d9166..cdb10ece35e 100644 --- a/src/intel/Makefile.sources +++ b/src/intel/Makefile.sources @@ -38,6 +38,8 @@ COMPILER_FILES = \ compiler/brw_dead_control_flow.cpp \ compiler/brw_dead_control_flow.h \ compiler/brw_disasm.c \ + compiler/brw_disasm_info.c \ + compiler/brw_disasm_info.h \ compiler/brw_eu.c \ compiler/brw_eu_compact.c \ compiler/brw_eu_defines.h \ @@ -115,9 +117,7 @@ COMPILER_FILES = \ compiler/brw_vue_map.c \ compiler/brw_wm_iz.cpp \ compiler/gen6_gs_visitor.cpp \ - compiler/gen6_gs_visitor.h \ - compiler/intel_asm_annotation.c \ - compiler/intel_asm_annotation.h + compiler/gen6_gs_visitor.h COMPILER_GENERATED_FILES = \ compiler/brw_nir_trig_workarounds.c diff --git a/src/intel/compiler/intel_asm_annotation.c b/src/intel/compiler/brw_disasm_info.c similarity index 99% rename from src/intel/compiler/intel_asm_annotation.c rename to src/intel/compiler/brw_disasm_info.c index 2ebe6dd8464..3db79ede708 100644 --- a/src/intel/compiler/intel_asm_annotation.c +++ b/src/intel/compiler/brw_disasm_info.c @@ -23,8 +23,8 @@ #include "brw_cfg.h" #include "brw_eu.h" +#include "brw_disasm_info.h" #include "common/gen_debug.h" -#include "intel_asm_annotation.h" #include "compiler/nir/nir.h" __attribute__((weak)) void nir_print_instr(const nir_instr *instr, FILE *fp) {} diff --git a/src/intel/compiler/intel_asm_annotation.h b/src/intel/compiler/brw_disasm_info.h similarity index 100% rename from src/intel/compiler/intel_asm_annotation.h rename to src/intel/compiler/brw_disasm_info.h diff --git a/src/intel/compiler/brw_eu.h b/src/intel/compiler/brw_eu.h index d66988da568..b5a206b3f10 100644 --- a/src/intel/compiler/brw_eu.h +++ b/src/intel/compiler/brw_eu.h @@ -37,7 +37,7 @@ #include "brw_inst.h" #include "brw_eu_defines.h" #include "brw_reg.h" -#include "intel_asm_annotation.h" +#include "brw_disasm_info.h" #ifdef __cplusplus extern "C" { diff --git a/src/intel/compiler/brw_eu_compact.c b/src/intel/compiler/brw_eu_compact.c index d2edb5586c2..8d33e2adffc 100644 --- a/src/intel/compiler/brw_eu_compact.c +++ b/src/intel/compiler/brw_eu_compact.c @@ -74,7 +74,7 @@ #include "brw_eu.h" #include "brw_shader.h" -#include "intel_asm_annotation.h" +#include "brw_disasm_info.h" #include "common/gen_debug.h" static const uint32_t g45_control_index_table[32] = { diff --git a/src/intel/compiler/meson.build b/src/intel/compiler/meson.build index d6fb8f4a648..fe0a1f6e8ac 100644 --- a/src/intel/compiler/meson.build +++ b/src/intel/compiler/meson.build @@ -34,6 +34,8 @@ libintel_compiler_files = files( 'brw_dead_control_flow.cpp', 'brw_dead_control_flow.h', 'brw_disasm.c', + 'brw_disasm_info.c', + 'brw_disasm_info.h', 'brw_eu.c', 'brw_eu_compact.c', 'brw_eu_defines.h', @@ -112,8 +114,6 @@ libintel_compiler_files = files( 'brw_wm_iz.cpp', 'gen6_gs_visitor.cpp', 'gen6_gs_visitor.h', - 'intel_asm_annotation.c', - 'intel_asm_annotation.h', ) brw_nir_trig = custom_target( -- 2.30.2