struct brw_cs_prog_key *key)
{
const struct gen_device_info *devinfo = &brw->screen->devinfo;
- struct gl_context *ctx = &brw->ctx;
const GLuint *program;
void *mem_ctx = ralloc_context(NULL);
- GLuint program_size;
struct brw_cs_prog_data prog_data;
bool start_busy = false;
double start_time = 0;
+ nir_shader *nir = nir_shader_clone(mem_ctx, cp->program.nir);
memset(&prog_data, 0, sizeof(prog_data));
if (cp->program.info.cs.shared_size > 64 * 1024) {
- cp->program.sh.data->LinkStatus = linking_failure;
+ cp->program.sh.data->LinkStatus = LINKING_FAILURE;
const char *error_str =
"Compute shader used more than 64KB of shared variables";
ralloc_strcat(&cp->program.sh.data->InfoLog, error_str);
assign_cs_binding_table_offsets(devinfo, &cp->program, &prog_data);
- /* Allocate the references to the uniforms that will end up in the
- * prog_data associated with the compiled program, and which will be freed
- * by the state cache.
- */
- int param_count = cp->program.nir->num_uniforms / 4;
-
- /* The backend also sometimes add a param for the thread local id. */
- prog_data.thread_local_id_index = param_count++;
-
- /* The backend also sometimes adds params for texture size. */
- param_count += 2 * ctx->Const.Program[MESA_SHADER_COMPUTE].MaxTextureImageUnits;
- prog_data.base.param = rzalloc_array(NULL, uint32_t, param_count);
- prog_data.base.pull_param = rzalloc_array(NULL, uint32_t, param_count);
- prog_data.base.nr_params = param_count;
-
- brw_nir_setup_glsl_uniforms(cp->program.nir, &cp->program,&prog_data.base,
- true);
+ brw_nir_setup_glsl_uniforms(mem_ctx, nir,
+ &cp->program, &prog_data.base, true);
if (unlikely(brw->perf_debug)) {
start_busy = (brw->batch.last_bo &&
char *error_str;
program = brw_compile_cs(brw->screen->compiler, brw, mem_ctx, key,
- &prog_data, cp->program.nir, st_index,
- &program_size, &error_str);
+ &prog_data, nir, st_index, &error_str);
if (program == NULL) {
- cp->program.sh.data->LinkStatus = linking_failure;
+ cp->program.sh.data->LinkStatus = LINKING_FAILURE;
ralloc_strcat(&cp->program.sh.data->InfoLog, error_str);
_mesa_problem(NULL, "Failed to compile compute shader: %s\n", error_str);
if (unlikely(brw->perf_debug)) {
if (cp->compiled_once) {
- _mesa_problem(&brw->ctx, "CS programs shouldn't need recompiles");
+ brw_debug_recompile(brw, MESA_SHADER_COMPUTE, cp->program.Id,
+ &key->base);
}
cp->compiled_once = true;
}
}
- const unsigned subslices = MAX2(brw->screen->subslice_total, 1);
-
- /* WaCSScratchSize:hsw
- *
- * Haswell's scratch space address calculation appears to be sparse
- * rather than tightly packed. The Thread ID has bits indicating
- * which subslice, EU within a subslice, and thread within an EU
- * it is. There's a maximum of two slices and two subslices, so these
- * can be stored with a single bit. Even though there are only 10 EUs
- * per subslice, this is stored in 4 bits, so there's an effective
- * maximum value of 16 EUs. Similarly, although there are only 7
- * threads per EU, this is stored in a 3 bit number, giving an effective
- * maximum value of 8 threads per EU.
- *
- * This means that we need to use 16 * 8 instead of 10 * 7 for the
- * number of threads per subslice.
- */
- const unsigned scratch_ids_per_subslice =
- devinfo->is_haswell ? 16 * 8 : devinfo->max_cs_threads;
-
- brw_alloc_stage_scratch(brw, &brw->cs.base,
- prog_data.base.total_scratch,
- scratch_ids_per_subslice * subslices);
+ brw_alloc_stage_scratch(brw, &brw->cs.base, prog_data.base.total_scratch);
+ /* The param and pull_param arrays will be freed by the shader cache. */
+ ralloc_steal(NULL, prog_data.base.param);
+ ralloc_steal(NULL, prog_data.base.pull_param);
brw_upload_cache(&brw->cache, BRW_CACHE_CS_PROG,
key, sizeof(*key),
- program, program_size,
+ program, prog_data.base.program_size,
&prog_data, sizeof(prog_data),
&brw->cs.base.prog_offset, &brw->cs.base.prog_data);
ralloc_free(mem_ctx);
}
-static void
+void
brw_cs_populate_key(struct brw_context *brw, struct brw_cs_prog_key *key)
{
struct gl_context *ctx = &brw->ctx;
/* BRW_NEW_COMPUTE_PROGRAM */
const struct brw_program *cp =
(struct brw_program *) brw->programs[MESA_SHADER_COMPUTE];
- const struct gl_program *prog = (struct gl_program *) cp;
memset(key, 0, sizeof(*key));
/* _NEW_TEXTURE */
- brw_populate_sampler_prog_key_data(ctx, prog, &key->tex);
-
- /* The unique compute program ID */
- key->program_string_id = cp->id;
+ brw_populate_base_prog_key(ctx, cp, &key->base);
}
brw_cs_populate_key(brw, &key);
- if (!brw_search_cache(&brw->cache, BRW_CACHE_CS_PROG,
- &key, sizeof(key),
- &brw->cs.base.prog_offset,
- &brw->cs.base.prog_data)) {
- bool success = brw_codegen_cs_prog(brw, cp, &key);
- (void) success;
- assert(success);
- }
+ if (brw_search_cache(&brw->cache, BRW_CACHE_CS_PROG, &key, sizeof(key),
+ &brw->cs.base.prog_offset, &brw->cs.base.prog_data,
+ true))
+ return;
+
+ if (brw_disk_cache_upload_program(brw, MESA_SHADER_COMPUTE))
+ return;
+
+ cp = (struct brw_program *) brw->programs[MESA_SHADER_COMPUTE];
+ cp->id = key.base.program_string_id;
+
+ ASSERTED bool success = brw_codegen_cs_prog(brw, cp, &key);
+ assert(success);
}
+void
+brw_cs_populate_default_key(const struct brw_compiler *compiler,
+ struct brw_cs_prog_key *key,
+ struct gl_program *prog)
+{
+ const struct gen_device_info *devinfo = compiler->devinfo;
+ memset(key, 0, sizeof(*key));
+ brw_populate_default_base_prog_key(devinfo, brw_program(prog), &key->base);
+}
bool
brw_cs_precompile(struct gl_context *ctx, struct gl_program *prog)
struct brw_program *bcp = brw_program(prog);
- memset(&key, 0, sizeof(key));
- key.program_string_id = bcp->id;
-
- brw_setup_tex_for_precompile(brw, &key.tex, prog);
+ brw_cs_populate_default_key(brw->screen->compiler, &key, prog);
uint32_t old_prog_offset = brw->cs.base.prog_offset;
struct brw_stage_prog_data *old_prog_data = brw->cs.base.prog_data;