Commit f36efe5e authored by Anuj Phogat's avatar Anuj Phogat Committed by Marge Bot
Browse files

intel: Rename _gen_{program, part, batch, freq} to _intel_{..}



export SEARCH_PATH="src/intel src/gallium/drivers/iris src/mesa/drivers/dri/i965
grep -E "[[:alnum:]]_gen_" -rIl $SEARCH_PATH | xargs sed -ie "s/_gen_\(program\|part\|batch\|freq\)/_intel_\1/g"
Signed-off-by: Anuj Phogat's avatarAnuj Phogat <anuj.phogat@gmail.com>
Reviewed-by: Kenneth Graunke's avatarKenneth Graunke <kenneth@whitecape.org>
Part-of: <mesa/mesa!10241>
parent c144cc78
......@@ -771,7 +771,7 @@ intel_perf_begin_query(struct intel_perf_context *perf_ctx,
* which reads a counter that increments by the number of clock
* cycles multiplied by the number of EUs. It can be calculated as:
*
* 2^(number of bits in A counter) / (n_eus * max_gen_freq * 2)
* 2^(number of bits in A counter) / (n_eus * max_intel_freq * 2)
*
* (E.g. 40 EUs @ 1GHz = ~53ms)
*
......
......@@ -394,7 +394,7 @@ static int qsort_hw_context_first(const void *a, const void *b)
}
static struct intel_batch_decode_bo
get_gen_batch_bo(void *user_data, bool ppgtt, uint64_t address)
get_intel_batch_bo(void *user_data, bool ppgtt, uint64_t address)
{
for (int s = 0; s < num_sections; s++) {
if (sections[s].gtt_offset <= address &&
......@@ -663,7 +663,7 @@ read_data_file(FILE *file)
struct intel_batch_decode_ctx batch_ctx;
intel_batch_decode_ctx_init(&batch_ctx, &devinfo, stdout, batch_flags,
xml_path, get_gen_batch_bo, NULL, NULL);
xml_path, get_intel_batch_bo, NULL, NULL);
for (int s = 0; s < num_sections; s++) {
......
......@@ -112,14 +112,14 @@ blob_has_part(void *blob, uint32_t size, enum driver_cache_blob_part part)
}
static bool
driver_blob_is_ready(void *blob, uint32_t size, bool with_gen_program)
driver_blob_is_ready(void *blob, uint32_t size, bool with_intel_program)
{
if (!blob) {
return false;
} else if (!blob_parts_valid(blob, size)) {
unreachable("Driver blob format is bad!");
return false;
} else if (blob_has_part(blob, size, GEN_PART) == with_gen_program) {
} else if (blob_has_part(blob, size, GEN_PART) == with_intel_program) {
return true;
} else {
return false;
......@@ -157,7 +157,7 @@ brw_program_serialize_nir(struct gl_context *ctx, struct gl_program *prog)
}
static bool
deserialize_gen_program(struct blob_reader *reader, struct gl_context *ctx,
deserialize_intel_program(struct blob_reader *reader, struct gl_context *ctx,
struct gl_program *prog, gl_shader_stage stage)
{
struct brw_context *brw = brw_context(ctx);
......@@ -209,7 +209,7 @@ brw_program_deserialize_driver_blob(struct gl_context *ctx,
ASSERTED uint32_t gen_size = blob_read_uint32(&reader);
assert(!reader.overrun &&
(uintptr_t)(reader.end - reader.current) > gen_size);
deserialize_gen_program(&reader, ctx, prog, stage);
deserialize_intel_program(&reader, ctx, prog, stage);
break;
}
case NIR_PART: {
......@@ -244,7 +244,7 @@ brw_deserialize_program_binary(struct gl_context *ctx,
}
static void
serialize_gen_part(struct blob *writer, struct gl_context *ctx,
serialize_intel_part(struct blob *writer, struct gl_context *ctx,
struct gl_shader_program *sh_prog,
struct gl_program *prog)
{
......@@ -297,7 +297,7 @@ brw_serialize_program_binary(struct gl_context *ctx,
struct blob writer;
blob_init(&writer);
serialize_nir_part(&writer, prog);
serialize_gen_part(&writer, ctx, sh_prog, prog);
serialize_intel_part(&writer, ctx, sh_prog, prog);
blob_write_uint32(&writer, END_PART);
prog->driver_cache_blob = ralloc_size(NULL, writer.size);
memcpy(prog->driver_cache_blob, writer.data, writer.size);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment