diff options
| author | Matt Turner <[email protected]> | 2017-03-09 16:01:30 -0800 |
|---|---|---|
| committer | Matt Turner <[email protected]> | 2017-03-10 17:58:11 -0800 |
| commit | fa4b792e833a5b9a74d21ca72babeeebc72fd052 (patch) | |
| tree | a59af4793c9523435577f87283166f8c09cbe779 | |
| parent | 32be87852b06aae4618505aa0f26586436a8c927 (diff) | |
i965: Move brw_init_compaction_tables() to brw_create_compiler().
... so that we can avoid threading complications or unnecessary
compaction table initializations (which just consists of setting some
pointers based on devinfo->gen).
Reviewed-by: Jason Ekstrand <[email protected]>
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_compiler.c | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_eu.c | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_eu_compact.c | 5 |
3 files changed, 2 insertions, 7 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_compiler.c b/src/mesa/drivers/dri/i965/brw_compiler.c index fcad570edff..cd9473f9a3b 100644 --- a/src/mesa/drivers/dri/i965/brw_compiler.c +++ b/src/mesa/drivers/dri/i965/brw_compiler.c @@ -23,6 +23,7 @@ #include "brw_compiler.h" #include "brw_shader.h" +#include "brw_eu.h" #include "common/gen_debug.h" #include "compiler/nir/nir.h" #include "main/errors.h" @@ -107,6 +108,7 @@ brw_compiler_create(void *mem_ctx, const struct gen_device_info *devinfo) brw_fs_alloc_reg_sets(compiler); brw_vec4_alloc_reg_set(compiler); + brw_init_compaction_tables(devinfo); compiler->precise_trig = env_var_as_boolean("INTEL_PRECISE_TRIG", false); diff --git a/src/mesa/drivers/dri/i965/brw_eu.c b/src/mesa/drivers/dri/i965/brw_eu.c index 1344f2b18e1..d280ffd7e15 100644 --- a/src/mesa/drivers/dri/i965/brw_eu.c +++ b/src/mesa/drivers/dri/i965/brw_eu.c @@ -354,8 +354,6 @@ brw_init_codegen(const struct gen_device_info *devinfo, p->loop_stack_array_size = 16; p->loop_stack = rzalloc_array(mem_ctx, int, p->loop_stack_array_size); p->if_depth_in_loop = rzalloc_array(mem_ctx, int, p->loop_stack_array_size); - - brw_init_compaction_tables(devinfo); } diff --git a/src/mesa/drivers/dri/i965/brw_eu_compact.c b/src/mesa/drivers/dri/i965/brw_eu_compact.c index 5b8e9b2b416..b2af76d533a 100644 --- a/src/mesa/drivers/dri/i965/brw_eu_compact.c +++ b/src/mesa/drivers/dri/i965/brw_eu_compact.c @@ -76,7 +76,6 @@ #include "brw_shader.h" #include "intel_asm_annotation.h" #include "common/gen_debug.h" -#include "util/u_atomic.h" /* for p_atomic_cmpxchg */ static const uint32_t g45_control_index_table[32] = { 0b00000000000000000, @@ -1345,10 +1344,6 @@ update_gen4_jump_count(const struct gen_device_info *devinfo, brw_inst *insn, void brw_init_compaction_tables(const struct gen_device_info *devinfo) { - static bool initialized; - if (initialized || p_atomic_cmpxchg(&initialized, false, true) != false) - return; - assert(g45_control_index_table[ARRAY_SIZE(g45_control_index_table) - 1] != 0); assert(g45_datatype_table[ARRAY_SIZE(g45_datatype_table) - 1] != 0); assert(g45_subreg_table[ARRAY_SIZE(g45_subreg_table) - 1] != 0); |