OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pan/bi: Rename BI_SWIZZLE to BI_SELECT

Browse Source 
The select version is more general.

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4766>
This commit is contained in:
Alyssa Rosenzweig
2020-04-24 19:10:44 -04:00
committed by Marge Bot
parent b2c6cf2b6d
commit ee561f0e6b
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/panfrost/bifrost/bi_pack.c
View File

@@ -948,7 +948,7 @@ bi_pack_fma(bi_clause *clause, bi_bundle bundle, struct bi_registers *regs)
case BI_MOV:
return bi_pack_fma_1src(bundle.fma, regs, BIFROST_FMA_OP_MOV);
case BI_SHIFT:
case BI_SWIZZLE:
case BI_SELECT:
case BI_ROUND:
return BIFROST_FMA_NOP;
case BI_REDUCE_FMA:
@@ -1284,7 +1284,7 @@ bi_pack_add(bi_clause *clause, bi_bundle bundle, struct bi_registers *regs)
return bi_pack_add_special(bundle.add, regs);
case BI_TABLE:
return bi_pack_add_table(bundle.add, regs);
case BI_SWIZZLE:
case BI_SELECT:
return BIFROST_ADD_NOP;
case BI_TEX:
if (bundle.add->op.texture == BI_TEX_COMPACT)

2
src/panfrost/bifrost/bi_print.c
View File

@@ -147,11 +147,11 @@ bi_class_name(enum bi_class cl)
case BI_LOAD_VAR_ADDRESS: return "load_var_address";
case BI_MINMAX: return "minmax";
case BI_MOV: return "mov";
case BI_SELECT: return "select";
case BI_SHIFT: return "shift";
case BI_STORE: return "store";
case BI_STORE_VAR: return "store_var";
case BI_SPECIAL: return "special";
case BI_SWIZZLE: return "swizzle";
case BI_TABLE: return "table";
case BI_TEX: return "tex";
case BI_ROUND: return "round";

2
src/panfrost/bifrost/bi_tables.c
View File

@@ -54,7 +54,7 @@ unsigned bi_class_props[BI_NUM_CLASSES] = {
[BI_STORE_VAR] = BI_SCHED_HI_LATENCY | BI_SCHED_ADD | BI_VECTOR | BI_DATA_REG_SRC,
[BI_SPECIAL] = BI_SCHED_ADD | BI_SCHED_SLOW,
[BI_TABLE] = BI_SCHED_ADD,
[BI_SWIZZLE] = BI_SCHED_ALL | BI_SWIZZLABLE,
[BI_SELECT] = BI_SCHED_ALL | BI_SWIZZLABLE,
[BI_TEX] = BI_SCHED_HI_LATENCY | BI_SCHED_ADD | BI_VECTOR | BI_DATA_REG_DEST,
[BI_ROUND] = BI_GENERIC | BI_ROUNDMODE | BI_SCHED_ALL,
};

2
src/panfrost/bifrost/compiler.h
View File

@@ -69,11 +69,11 @@ enum bi_class {
BI_MINMAX,
BI_MOV,
BI_REDUCE_FMA,
BI_SELECT,
BI_SHIFT,
BI_STORE,
BI_STORE_VAR,
BI_SPECIAL, /* _FAST on supported GPUs */
BI_SWIZZLE,
BI_TABLE,
BI_TEX,
BI_ROUND,

2
src/panfrost/bifrost/test/bi_interpret.c
View File

@@ -530,7 +530,7 @@ bit_step(struct bit_state *s, bi_instruction *ins, bool FMA)
}
case BI_SHIFT:
case BI_SWIZZLE:
case BI_SELECT:
case BI_ROUND:
unreachable("Unsupported op");