From a51aa6feb4dab07e29b9834f7ad431cc0dd6f9fe Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Thu, 10 Sep 2020 13:26:57 -0400 Subject: [PATCH] pan/bi: Drop *FMIN reference Even on G72, it's unsupported. Signed-off-by: Alyssa Rosenzweig Reviewed-by: Daniel Stone Part-of: --- src/panfrost/bifrost/bi_pack.c | 2 -- src/panfrost/bifrost/bi_tables.c | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/panfrost/bifrost/bi_pack.c b/src/panfrost/bifrost/bi_pack.c index 76b4de791e9..51509d5c12d 100644 --- a/src/panfrost/bifrost/bi_pack.c +++ b/src/panfrost/bifrost/bi_pack.c @@ -562,8 +562,6 @@ bi_pack_fma(bi_clause *clause, bi_bundle bundle, bi_registers *regs) return pan_pack_fma_iaddc_i32(clause, bundle.fma, regs); else return pan_pack_fma_isubb_i32(clause, bundle.fma, regs); - case BI_MINMAX: - unreachable("FMIN/FMAX not supported on FMA since G72"); case BI_MOV: return pan_pack_fma_mov_i32(clause, bundle.fma, regs); case BI_SELECT: diff --git a/src/panfrost/bifrost/bi_tables.c b/src/panfrost/bifrost/bi_tables.c index 942de5eae5a..0891a278dce 100644 --- a/src/panfrost/bifrost/bi_tables.c +++ b/src/panfrost/bifrost/bi_tables.c @@ -45,7 +45,7 @@ unsigned bi_class_props[BI_NUM_CLASSES] = { [BI_LOAD_ATTR] = BI_SCHED_HI_LATENCY | BI_SCHED_ADD | BI_VECTOR | BI_DATA_REG_DEST, [BI_LOAD_VAR] = BI_SCHED_HI_LATENCY | BI_SCHED_ADD | BI_VECTOR | BI_DATA_REG_DEST, [BI_LOAD_VAR_ADDRESS] = BI_SCHED_HI_LATENCY | BI_SCHED_ADD | BI_VECTOR | BI_DATA_REG_DEST, - [BI_MINMAX] = BI_SCHED_ADD | BI_NO_ABS_ABS_FP16_FMA | BI_MODS, /* | FMA on some? */ + [BI_MINMAX] = BI_SCHED_ADD | BI_NO_ABS_ABS_FP16_FMA | BI_MODS, [BI_MOV] = BI_SCHED_ALL, [BI_FMOV] = BI_MODS | BI_SCHED_ALL, [BI_REDUCE_FMA] = BI_SCHED_FMA,