From 62adb6522b4b4f1f31e0828abbe496ecac5035e3 Mon Sep 17 00:00:00 2001 From: Robert Foss Date: Wed, 15 Jan 2020 01:14:16 +0100 Subject: panfrost: Prefix schedule_program to prevent collision Currently the schedule_program implementation being used is picked at compile time, which on the Android platform means that the bifrost compiler & scheduler is used for all targets, including midgard based hardware. This commit disambiguates between the two schedule_program functions. Signed-off-by: Robert Foss Reviewed-by: Alyssa Rosenzweig --- src/panfrost/bifrost/bifrost_compile.c | 2 +- src/panfrost/bifrost/bifrost_sched.c | 2 +- src/panfrost/bifrost/bifrost_sched.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/panfrost/bifrost') diff --git a/src/panfrost/bifrost/bifrost_compile.c b/src/panfrost/bifrost/bifrost_compile.c index 2af36ee8668..abc981d87bb 100644 --- a/src/panfrost/bifrost/bifrost_compile.c +++ b/src/panfrost/bifrost/bifrost_compile.c @@ -1041,7 +1041,7 @@ bifrost_compile_shader_nir(nir_shader *nir, struct bifrost_program *program) } } while (progress); - schedule_program(ctx); + bifrost_schedule_program(ctx); #ifdef BI_DEBUG nir_print_shader(nir, stdout); diff --git a/src/panfrost/bifrost/bifrost_sched.c b/src/panfrost/bifrost/bifrost_sched.c index f9629f8f957..37ae52bac42 100644 --- a/src/panfrost/bifrost/bifrost_sched.c +++ b/src/panfrost/bifrost/bifrost_sched.c @@ -374,7 +374,7 @@ remove_extract_elements(compiler_context *ctx, bifrost_block *block) } -void schedule_program(compiler_context *ctx) +void bifrost_schedule_program(compiler_context *ctx) { // XXX: we should move instructions together before RA that can feed in to each other and be scheduled in the same clause allocate_registers(ctx); diff --git a/src/panfrost/bifrost/bifrost_sched.h b/src/panfrost/bifrost/bifrost_sched.h index cb9d383010a..7edd95a9dfb 100644 --- a/src/panfrost/bifrost/bifrost_sched.h +++ b/src/panfrost/bifrost/bifrost_sched.h @@ -24,6 +24,6 @@ #define bifrost_ra_h #include "compiler_defines.h" -void schedule_program(compiler_context *ctx); +void bifrost_schedule_program(compiler_context *ctx); #endif /* bifrost_ra_h */ -- cgit v1.2.3