From 7fb1e58651369ac717ceec7d155ed0294a99bf25 Mon Sep 17 00:00:00 2001 From: Caio Marcelo de Oliveira Filho Date: Tue, 23 Mar 2021 11:31:51 -0700 Subject: [PATCH] intel/compiler: Make visitors take debug_enabled as a parameter The callers already have this value, and we would like to make it follow different rules other than stage that might not be visible to the helper function, so just pass explicitly. Reviewed-by: Kenneth Graunke Reviewed-by: Jordan Justen Part-of: --- src/intel/compiler/brw_fs.cpp | 21 +++++++++++-------- src/intel/compiler/brw_fs.h | 4 +++- src/intel/compiler/brw_fs_visitor.cpp | 9 +++++--- src/intel/compiler/brw_shader.cpp | 9 ++++---- src/intel/compiler/brw_shader.h | 3 ++- src/intel/compiler/brw_vec4.cpp | 6 ++++-- src/intel/compiler/brw_vec4.h | 3 ++- src/intel/compiler/brw_vec4_gs_visitor.cpp | 18 +++++++++------- src/intel/compiler/brw_vec4_gs_visitor.h | 3 ++- src/intel/compiler/brw_vec4_tcs.cpp | 10 +++++---- src/intel/compiler/brw_vec4_tcs.h | 1 + src/intel/compiler/brw_vec4_tes.cpp | 5 +++-- src/intel/compiler/brw_vec4_tes.h | 3 ++- src/intel/compiler/brw_vec4_visitor.cpp | 8 ++++--- src/intel/compiler/brw_vec4_vs.h | 3 ++- src/intel/compiler/brw_vec4_vs_visitor.cpp | 6 ++++-- src/intel/compiler/gen6_gs_visitor.h | 5 +++-- .../compiler/test_fs_cmod_propagation.cpp | 2 +- .../compiler/test_fs_copy_propagation.cpp | 2 +- .../compiler/test_fs_saturate_propagation.cpp | 2 +- src/intel/compiler/test_fs_scoreboard.cpp | 2 +- .../compiler/test_vec4_cmod_propagation.cpp | 2 +- .../compiler/test_vec4_copy_propagation.cpp | 2 +- .../test_vec4_dead_code_eliminate.cpp | 2 +- .../compiler/test_vec4_register_coalesce.cpp | 2 +- 25 files changed, 80 insertions(+), 53 deletions(-) diff --git a/src/intel/compiler/brw_fs.cpp b/src/intel/compiler/brw_fs.cpp index 755c0fdf655..07ff18d9fbf 100644 --- a/src/intel/compiler/brw_fs.cpp +++ b/src/intel/compiler/brw_fs.cpp @@ -682,7 +682,7 @@ fs_visitor::vfail(const char *format, va_list va) this->fail_msg = msg; - if (debug_enabled) { + if (unlikely(debug_enabled)) { fprintf(stderr, "%s", msg); } } @@ -9104,7 +9104,8 @@ brw_compile_fs(const struct brw_compiler *compiler, v8 = new fs_visitor(compiler, params->log_data, mem_ctx, &key->base, &prog_data->base, nir, 8, - params->shader_time ? params->shader_time_index8 : -1); + params->shader_time ? params->shader_time_index8 : -1, + debug_enabled); if (!v8->run_fs(allow_spilling, false /* do_rep_send */)) { params->error_str = ralloc_strdup(mem_ctx, v8->fail_msg); delete v8; @@ -9135,7 +9136,8 @@ brw_compile_fs(const struct brw_compiler *compiler, /* Try a SIMD16 compile */ v16 = new fs_visitor(compiler, params->log_data, mem_ctx, &key->base, &prog_data->base, nir, 16, - params->shader_time ? params->shader_time_index16 : -1); + params->shader_time ? params->shader_time_index16 : -1, + debug_enabled); v16->import_uniforms(v8); if (!v16->run_fs(allow_spilling, params->use_rep_send)) { compiler->shader_perf_log(params->log_data, @@ -9162,7 +9164,8 @@ brw_compile_fs(const struct brw_compiler *compiler, /* Try a SIMD32 compile */ v32 = new fs_visitor(compiler, params->log_data, mem_ctx, &key->base, &prog_data->base, nir, 32, - params->shader_time ? params->shader_time_index32 : -1); + params->shader_time ? params->shader_time_index32 : -1, + debug_enabled); v32->import_uniforms(v8); if (!v32->run_fs(allow_spilling, false)) { compiler->shader_perf_log(params->log_data, @@ -9498,7 +9501,7 @@ brw_compile_cs(const struct brw_compiler *compiler, void *log_data, nir, 8, debug_enabled); v8 = new fs_visitor(compiler, log_data, mem_ctx, &key->base, &prog_data->base, - nir8, 8, shader_time_index); + nir8, 8, shader_time_index, debug_enabled); if (!v8->run_cs(true /* allow_spilling */)) { if (error_str) *error_str = ralloc_strdup(mem_ctx, v8->fail_msg); @@ -9524,7 +9527,7 @@ brw_compile_cs(const struct brw_compiler *compiler, void *log_data, nir, 16, debug_enabled); v16 = new fs_visitor(compiler, log_data, mem_ctx, &key->base, &prog_data->base, - nir16, 16, shader_time_index); + nir16, 16, shader_time_index, debug_enabled); if (v8) v16->import_uniforms(v8); @@ -9572,7 +9575,7 @@ brw_compile_cs(const struct brw_compiler *compiler, void *log_data, nir, 32, debug_enabled); v32 = new fs_visitor(compiler, log_data, mem_ctx, &key->base, &prog_data->base, - nir32, 32, shader_time_index); + nir32, 32, shader_time_index, debug_enabled); if (v8) v32->import_uniforms(v8); else if (v16) @@ -9729,7 +9732,7 @@ brw_compile_bs(const struct brw_compiler *compiler, void *log_data, if (likely(!(INTEL_DEBUG & DEBUG_NO8))) { v8 = new fs_visitor(compiler, log_data, mem_ctx, &key->base, &prog_data->base, shader, - 8, -1 /* shader time */); + 8, -1 /* shader time */, debug_enabled); const bool allow_spilling = true; if (!v8->run_bs(allow_spilling)) { if (error_str) @@ -9747,7 +9750,7 @@ brw_compile_bs(const struct brw_compiler *compiler, void *log_data, if (!has_spilled && likely(!(INTEL_DEBUG & DEBUG_NO16))) { v16 = new fs_visitor(compiler, log_data, mem_ctx, &key->base, &prog_data->base, shader, - 16, -1 /* shader time */); + 16, -1 /* shader time */, debug_enabled); const bool allow_spilling = (v == NULL); if (!v16->run_bs(allow_spilling)) { compiler->shader_perf_log(log_data, diff --git a/src/intel/compiler/brw_fs.h b/src/intel/compiler/brw_fs.h index ff718cfa8d0..679595d46d0 100644 --- a/src/intel/compiler/brw_fs.h +++ b/src/intel/compiler/brw_fs.h @@ -100,13 +100,15 @@ public: const nir_shader *shader, unsigned dispatch_width, int shader_time_index, + bool debug_enabled, const struct brw_vue_map *input_vue_map = NULL); fs_visitor(const struct brw_compiler *compiler, void *log_data, void *mem_ctx, struct brw_gs_compile *gs_compile, struct brw_gs_prog_data *prog_data, const nir_shader *shader, - int shader_time_index); + int shader_time_index, + bool debug_enabled); void init(); ~fs_visitor(); diff --git a/src/intel/compiler/brw_fs_visitor.cpp b/src/intel/compiler/brw_fs_visitor.cpp index 7c46086a1b2..a18bde812ed 100644 --- a/src/intel/compiler/brw_fs_visitor.cpp +++ b/src/intel/compiler/brw_fs_visitor.cpp @@ -901,8 +901,10 @@ fs_visitor::fs_visitor(const struct brw_compiler *compiler, void *log_data, const nir_shader *shader, unsigned dispatch_width, int shader_time_index, + bool debug_enabled, const struct brw_vue_map *input_vue_map) - : backend_shader(compiler, log_data, mem_ctx, shader, prog_data), + : backend_shader(compiler, log_data, mem_ctx, shader, prog_data, + debug_enabled), key(key), gs_compile(NULL), prog_data(prog_data), input_vue_map(input_vue_map), live_analysis(this), regpressure_analysis(this), @@ -919,9 +921,10 @@ fs_visitor::fs_visitor(const struct brw_compiler *compiler, void *log_data, struct brw_gs_compile *c, struct brw_gs_prog_data *prog_data, const nir_shader *shader, - int shader_time_index) + int shader_time_index, + bool debug_enabled) : backend_shader(compiler, log_data, mem_ctx, shader, - &prog_data->base.base), + &prog_data->base.base, debug_enabled), key(&c->key.base), gs_compile(c), prog_data(&prog_data->base.base), live_analysis(this), regpressure_analysis(this), diff --git a/src/intel/compiler/brw_shader.cpp b/src/intel/compiler/brw_shader.cpp index f8495df10be..fe69ac7912e 100644 --- a/src/intel/compiler/brw_shader.cpp +++ b/src/intel/compiler/brw_shader.cpp @@ -719,7 +719,8 @@ backend_shader::backend_shader(const struct brw_compiler *compiler, void *log_data, void *mem_ctx, const nir_shader *shader, - struct brw_stage_prog_data *stage_prog_data) + struct brw_stage_prog_data *stage_prog_data, + bool debug_enabled) : compiler(compiler), log_data(log_data), devinfo(compiler->devinfo), @@ -727,9 +728,9 @@ backend_shader::backend_shader(const struct brw_compiler *compiler, stage_prog_data(stage_prog_data), mem_ctx(mem_ctx), cfg(NULL), idom_analysis(this), - stage(shader->info.stage) + stage(shader->info.stage), + debug_enabled(debug_enabled) { - debug_enabled = INTEL_DEBUG & intel_debug_flag_for_shader_stage(stage); stage_name = _mesa_shader_stage_to_string(stage); stage_abbrev = _mesa_shader_stage_to_abbrev(stage); } @@ -1422,7 +1423,7 @@ brw_compile_tes(const struct brw_compiler *compiler, assembly = g.get_assembly(); } else { brw::vec4_tes_visitor v(compiler, log_data, key, prog_data, - nir, mem_ctx, shader_time_index); + nir, mem_ctx, shader_time_index, debug_enabled); if (!v.run()) { if (error_str) *error_str = ralloc_strdup(mem_ctx, v.fail_msg); diff --git a/src/intel/compiler/brw_shader.h b/src/intel/compiler/brw_shader.h index 5085d1fb99c..b222b354b71 100644 --- a/src/intel/compiler/brw_shader.h +++ b/src/intel/compiler/brw_shader.h @@ -47,7 +47,8 @@ protected: void *log_data, void *mem_ctx, const nir_shader *shader, - struct brw_stage_prog_data *stage_prog_data); + struct brw_stage_prog_data *stage_prog_data, + bool debug_enabled); public: virtual ~backend_shader(); diff --git a/src/intel/compiler/brw_vec4.cpp b/src/intel/compiler/brw_vec4.cpp index 35637f81c25..5bffdde40af 100644 --- a/src/intel/compiler/brw_vec4.cpp +++ b/src/intel/compiler/brw_vec4.cpp @@ -2946,7 +2946,8 @@ brw_compile_vs(const struct brw_compiler *compiler, fs_visitor v(compiler, params->log_data, mem_ctx, &key->base, &prog_data->base.base, nir, 8, - params->shader_time ? params->shader_time_index : -1); + params->shader_time ? params->shader_time_index : -1, + debug_enabled); if (!v.run_vs()) { params->error_str = ralloc_strdup(mem_ctx, v.fail_msg); return NULL; @@ -2977,7 +2978,8 @@ brw_compile_vs(const struct brw_compiler *compiler, vec4_vs_visitor v(compiler, params->log_data, key, prog_data, nir, mem_ctx, - params->shader_time ? params->shader_time_index : -1); + params->shader_time ? params->shader_time_index : -1, + debug_enabled); if (!v.run()) { params->error_str = ralloc_strdup(mem_ctx, v.fail_msg); return NULL; diff --git a/src/intel/compiler/brw_vec4.h b/src/intel/compiler/brw_vec4.h index fa52cdc9566..94a4dde554c 100644 --- a/src/intel/compiler/brw_vec4.h +++ b/src/intel/compiler/brw_vec4.h @@ -72,7 +72,8 @@ public: const nir_shader *shader, void *mem_ctx, bool no_spills, - int shader_time_index); + int shader_time_index, + bool debug_enabled); dst_reg dst_null_f() { diff --git a/src/intel/compiler/brw_vec4_gs_visitor.cpp b/src/intel/compiler/brw_vec4_gs_visitor.cpp index 8454d84de61..1871f70f3ac 100644 --- a/src/intel/compiler/brw_vec4_gs_visitor.cpp +++ b/src/intel/compiler/brw_vec4_gs_visitor.cpp @@ -43,10 +43,11 @@ vec4_gs_visitor::vec4_gs_visitor(const struct brw_compiler *compiler, const nir_shader *shader, void *mem_ctx, bool no_spills, - int shader_time_index) + int shader_time_index, + bool debug_enabled) : vec4_visitor(compiler, log_data, &c->key.base.tex, &prog_data->base, shader, mem_ctx, - no_spills, shader_time_index), + no_spills, shader_time_index, debug_enabled), c(c), gs_prog_data(prog_data) { @@ -820,7 +821,7 @@ brw_compile_gs(const struct brw_compiler *compiler, void *log_data, if (is_scalar) { fs_visitor v(compiler, log_data, mem_ctx, &c, prog_data, nir, - shader_time_index); + shader_time_index, debug_enabled); if (v.run_gs()) { prog_data->base.dispatch_mode = DISPATCH_MODE_SIMD8; prog_data->base.base.dispatch_grf_start_reg = v.payload.num_regs; @@ -856,7 +857,8 @@ brw_compile_gs(const struct brw_compiler *compiler, void *log_data, prog_data->base.dispatch_mode = DISPATCH_MODE_4X2_DUAL_OBJECT; brw::vec4_gs_visitor v(compiler, log_data, &c, prog_data, nir, - mem_ctx, true /* no_spills */, shader_time_index); + mem_ctx, true /* no_spills */, + shader_time_index, debug_enabled); /* Backup 'nr_params' and 'param' as they can be modified by the * the DUAL_OBJECT visitor. If it fails, we will run the fallback @@ -926,12 +928,12 @@ brw_compile_gs(const struct brw_compiler *compiler, void *log_data, if (compiler->devinfo->gen >= 7) gs = new brw::vec4_gs_visitor(compiler, log_data, &c, prog_data, - nir, mem_ctx, false /* no_spills */, - shader_time_index); + nir, mem_ctx, false /* no_spills */, + shader_time_index, debug_enabled); else gs = new brw::gen6_gs_visitor(compiler, log_data, &c, prog_data, prog, - nir, mem_ctx, false /* no_spills */, - shader_time_index); + nir, mem_ctx, false /* no_spills */, + shader_time_index, debug_enabled); if (!gs->run()) { if (error_str) diff --git a/src/intel/compiler/brw_vec4_gs_visitor.h b/src/intel/compiler/brw_vec4_gs_visitor.h index c6565594cf0..64df8935747 100644 --- a/src/intel/compiler/brw_vec4_gs_visitor.h +++ b/src/intel/compiler/brw_vec4_gs_visitor.h @@ -47,7 +47,8 @@ public: const nir_shader *shader, void *mem_ctx, bool no_spills, - int shader_time_index); + int shader_time_index, + bool debug_enabled); virtual void nir_setup_inputs(); diff --git a/src/intel/compiler/brw_vec4_tcs.cpp b/src/intel/compiler/brw_vec4_tcs.cpp index 0053cd79775..7b5b1218d0c 100644 --- a/src/intel/compiler/brw_vec4_tcs.cpp +++ b/src/intel/compiler/brw_vec4_tcs.cpp @@ -41,9 +41,10 @@ vec4_tcs_visitor::vec4_tcs_visitor(const struct brw_compiler *compiler, const nir_shader *nir, void *mem_ctx, int shader_time_index, + bool debug_enabled, const struct brw_vue_map *input_vue_map) : vec4_visitor(compiler, log_data, &key->base.tex, &prog_data->base, - nir, mem_ctx, false, shader_time_index), + nir, mem_ctx, false, shader_time_index, debug_enabled), input_vue_map(input_vue_map), key(key) { } @@ -459,7 +460,7 @@ brw_compile_tcs(const struct brw_compiler *compiler, if (is_scalar) { fs_visitor v(compiler, log_data, mem_ctx, &key->base, &prog_data->base.base, nir, 8, - shader_time_index, &input_vue_map); + shader_time_index, debug_enabled, &input_vue_map); if (!v.run_tcs()) { if (error_str) *error_str = ralloc_strdup(mem_ctx, v.fail_msg); @@ -470,7 +471,7 @@ brw_compile_tcs(const struct brw_compiler *compiler, fs_generator g(compiler, log_data, mem_ctx, &prog_data->base.base, false, MESA_SHADER_TESS_CTRL); - if (INTEL_DEBUG & DEBUG_TCS) { + if (unlikely(debug_enabled)) { g.enable_debug(ralloc_asprintf(mem_ctx, "%s tessellation control shader %s", nir->info.label ? nir->info.label @@ -486,7 +487,8 @@ brw_compile_tcs(const struct brw_compiler *compiler, assembly = g.get_assembly(); } else { brw::vec4_tcs_visitor v(compiler, log_data, key, prog_data, - nir, mem_ctx, shader_time_index, &input_vue_map); + nir, mem_ctx, shader_time_index, + debug_enabled, &input_vue_map); if (!v.run()) { if (error_str) *error_str = ralloc_strdup(mem_ctx, v.fail_msg); diff --git a/src/intel/compiler/brw_vec4_tcs.h b/src/intel/compiler/brw_vec4_tcs.h index d0285673adc..11921b1bb89 100644 --- a/src/intel/compiler/brw_vec4_tcs.h +++ b/src/intel/compiler/brw_vec4_tcs.h @@ -46,6 +46,7 @@ public: const nir_shader *nir, void *mem_ctx, int shader_time_index, + bool debug_enabled, const struct brw_vue_map *input_vue_map); protected: diff --git a/src/intel/compiler/brw_vec4_tes.cpp b/src/intel/compiler/brw_vec4_tes.cpp index a5e5d966531..94856c88cb8 100644 --- a/src/intel/compiler/brw_vec4_tes.cpp +++ b/src/intel/compiler/brw_vec4_tes.cpp @@ -39,9 +39,10 @@ vec4_tes_visitor::vec4_tes_visitor(const struct brw_compiler *compiler, struct brw_tes_prog_data *prog_data, const nir_shader *shader, void *mem_ctx, - int shader_time_index) + int shader_time_index, + bool debug_enabled) : vec4_visitor(compiler, log_data, &key->base.tex, &prog_data->base, - shader, mem_ctx, false, shader_time_index) + shader, mem_ctx, false, shader_time_index, debug_enabled) { } diff --git a/src/intel/compiler/brw_vec4_tes.h b/src/intel/compiler/brw_vec4_tes.h index 7da3e5fa6cc..fdd5fd6ddee 100644 --- a/src/intel/compiler/brw_vec4_tes.h +++ b/src/intel/compiler/brw_vec4_tes.h @@ -44,7 +44,8 @@ public: struct brw_tes_prog_data *prog_data, const nir_shader *nir, void *mem_ctx, - int shader_time_index); + int shader_time_index, + bool debug_enabled); protected: virtual void nir_emit_intrinsic(nir_intrinsic_instr *instr); diff --git a/src/intel/compiler/brw_vec4_visitor.cpp b/src/intel/compiler/brw_vec4_visitor.cpp index f6809295cd9..0e073ae478c 100644 --- a/src/intel/compiler/brw_vec4_visitor.cpp +++ b/src/intel/compiler/brw_vec4_visitor.cpp @@ -1763,8 +1763,10 @@ vec4_visitor::vec4_visitor(const struct brw_compiler *compiler, const nir_shader *shader, void *mem_ctx, bool no_spills, - int shader_time_index) - : backend_shader(compiler, log_data, mem_ctx, shader, &prog_data->base), + int shader_time_index, + bool debug_enabled) + : backend_shader(compiler, log_data, mem_ctx, shader, &prog_data->base, + debug_enabled), key_tex(key_tex), prog_data(prog_data), fail_msg(NULL), @@ -1810,7 +1812,7 @@ vec4_visitor::fail(const char *format, ...) this->fail_msg = msg; - if (debug_enabled) { + if (unlikely(debug_enabled)) { fprintf(stderr, "%s", msg); } } diff --git a/src/intel/compiler/brw_vec4_vs.h b/src/intel/compiler/brw_vec4_vs.h index 7662b6a73d6..ec66354a50c 100644 --- a/src/intel/compiler/brw_vec4_vs.h +++ b/src/intel/compiler/brw_vec4_vs.h @@ -37,7 +37,8 @@ public: struct brw_vs_prog_data *vs_prog_data, const nir_shader *shader, void *mem_ctx, - int shader_time_index); + int shader_time_index, + bool debug_enabled); protected: virtual void setup_payload(); diff --git a/src/intel/compiler/brw_vec4_vs_visitor.cpp b/src/intel/compiler/brw_vec4_vs_visitor.cpp index ab351dbd39b..07f7a065309 100644 --- a/src/intel/compiler/brw_vec4_vs_visitor.cpp +++ b/src/intel/compiler/brw_vec4_vs_visitor.cpp @@ -103,9 +103,11 @@ vec4_vs_visitor::vec4_vs_visitor(const struct brw_compiler *compiler, struct brw_vs_prog_data *vs_prog_data, const nir_shader *shader, void *mem_ctx, - int shader_time_index) + int shader_time_index, + bool debug_enabled) : vec4_visitor(compiler, log_data, &key->base.tex, &vs_prog_data->base, - shader, mem_ctx, false /* no_spills */, shader_time_index), + shader, mem_ctx, false /* no_spills */, shader_time_index, + debug_enabled), key(key), vs_prog_data(vs_prog_data) { diff --git a/src/intel/compiler/gen6_gs_visitor.h b/src/intel/compiler/gen6_gs_visitor.h index 1bdcf925880..d028969cfad 100644 --- a/src/intel/compiler/gen6_gs_visitor.h +++ b/src/intel/compiler/gen6_gs_visitor.h @@ -43,9 +43,10 @@ public: const nir_shader *shader, void *mem_ctx, bool no_spills, - int shader_time_index) : + int shader_time_index, + bool debug_enabled) : vec4_gs_visitor(comp, log_data, c, prog_data, shader, mem_ctx, no_spills, - shader_time_index), + shader_time_index, debug_enabled), prog(prog) { } diff --git a/src/intel/compiler/test_fs_cmod_propagation.cpp b/src/intel/compiler/test_fs_cmod_propagation.cpp index c45fe011a8c..82e4a3bcb3e 100644 --- a/src/intel/compiler/test_fs_cmod_propagation.cpp +++ b/src/intel/compiler/test_fs_cmod_propagation.cpp @@ -59,7 +59,7 @@ public: struct brw_wm_prog_data *prog_data, nir_shader *shader) : fs_visitor(compiler, NULL, mem_ctx, NULL, - &prog_data->base, shader, 8, -1) {} + &prog_data->base, shader, 8, -1, false) {} }; diff --git a/src/intel/compiler/test_fs_copy_propagation.cpp b/src/intel/compiler/test_fs_copy_propagation.cpp index d00bbd8a225..a4b4a4dacf6 100644 --- a/src/intel/compiler/test_fs_copy_propagation.cpp +++ b/src/intel/compiler/test_fs_copy_propagation.cpp @@ -49,7 +49,7 @@ public: struct brw_wm_prog_data *prog_data, nir_shader *shader) : fs_visitor(compiler, NULL, mem_ctx, NULL, - &prog_data->base, shader, 8, -1) {} + &prog_data->base, shader, 8, -1, false) {} }; diff --git a/src/intel/compiler/test_fs_saturate_propagation.cpp b/src/intel/compiler/test_fs_saturate_propagation.cpp index 5d257164cf5..cfa35faaf3b 100644 --- a/src/intel/compiler/test_fs_saturate_propagation.cpp +++ b/src/intel/compiler/test_fs_saturate_propagation.cpp @@ -49,7 +49,7 @@ public: struct brw_wm_prog_data *prog_data, nir_shader *shader) : fs_visitor(compiler, NULL, mem_ctx, NULL, - &prog_data->base, shader, 16, -1) {} + &prog_data->base, shader, 16, -1, false) {} }; diff --git a/src/intel/compiler/test_fs_scoreboard.cpp b/src/intel/compiler/test_fs_scoreboard.cpp index d356daf9ec2..abe0a3d9f0d 100644 --- a/src/intel/compiler/test_fs_scoreboard.cpp +++ b/src/intel/compiler/test_fs_scoreboard.cpp @@ -52,7 +52,7 @@ void scoreboard_test::SetUp() nir_shader *shader = nir_shader_create(ctx, MESA_SHADER_FRAGMENT, NULL, NULL); - v = new fs_visitor(compiler, NULL, ctx, NULL, &prog_data->base, shader, 8, -1); + v = new fs_visitor(compiler, NULL, ctx, NULL, &prog_data->base, shader, 8, -1, false); devinfo->gen = 12; devinfo->genx10 = devinfo->gen * 10; diff --git a/src/intel/compiler/test_vec4_cmod_propagation.cpp b/src/intel/compiler/test_vec4_cmod_propagation.cpp index c241f163a60..bfdb7121482 100644 --- a/src/intel/compiler/test_vec4_cmod_propagation.cpp +++ b/src/intel/compiler/test_vec4_cmod_propagation.cpp @@ -52,7 +52,7 @@ public: nir_shader *shader, struct brw_vue_prog_data *prog_data) : vec4_visitor(compiler, NULL, NULL, prog_data, shader, mem_ctx, - false, -1) + false, -1, false) { prog_data->dispatch_mode = DISPATCH_MODE_4X2_DUAL_OBJECT; } diff --git a/src/intel/compiler/test_vec4_copy_propagation.cpp b/src/intel/compiler/test_vec4_copy_propagation.cpp index 67754909444..d2024f24112 100644 --- a/src/intel/compiler/test_vec4_copy_propagation.cpp +++ b/src/intel/compiler/test_vec4_copy_propagation.cpp @@ -50,7 +50,7 @@ public: nir_shader *shader, struct brw_vue_prog_data *prog_data) : vec4_visitor(compiler, NULL, NULL, prog_data, shader, mem_ctx, - false /* no_spills */, -1) + false /* no_spills */, -1, false) { prog_data->dispatch_mode = DISPATCH_MODE_4X2_DUAL_OBJECT; } diff --git a/src/intel/compiler/test_vec4_dead_code_eliminate.cpp b/src/intel/compiler/test_vec4_dead_code_eliminate.cpp index 535198425f2..cc2823cbc17 100644 --- a/src/intel/compiler/test_vec4_dead_code_eliminate.cpp +++ b/src/intel/compiler/test_vec4_dead_code_eliminate.cpp @@ -48,7 +48,7 @@ public: nir_shader *shader, struct brw_vue_prog_data *prog_data) : vec4_visitor(compiler, NULL, NULL, prog_data, shader, mem_ctx, - false /* no_spills */, -1) + false /* no_spills */, -1, false) { prog_data->dispatch_mode = DISPATCH_MODE_4X2_DUAL_OBJECT; } diff --git a/src/intel/compiler/test_vec4_register_coalesce.cpp b/src/intel/compiler/test_vec4_register_coalesce.cpp index 6e4cee41a73..95ea4a6c9d0 100644 --- a/src/intel/compiler/test_vec4_register_coalesce.cpp +++ b/src/intel/compiler/test_vec4_register_coalesce.cpp @@ -53,7 +53,7 @@ public: nir_shader *shader, struct brw_vue_prog_data *prog_data) : vec4_visitor(compiler, NULL, NULL, prog_data, shader, mem_ctx, - false /* no_spills */, -1) + false /* no_spills */, -1, false) { prog_data->dispatch_mode = DISPATCH_MODE_4X2_DUAL_OBJECT; }