fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-08 15:00:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

freedreno/ir3: Don't use negative opc for meta instructions

Browse source 
Stricter compilers complain about this, ie:

  error: left operand of shift expression ‘(-1 << 7)’ is negative [-fpermissive]

Signed-off-by: Rob Clark <robdclark@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21846>
This commit is contained in:
Rob Clark 2022-08-05 09:39:18 -07:00 • committed by Marge Bot
parent 7c7761574e
commit bff0ff5ae3
4 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/freedreno/ir3/disasm-a3xx.c
View file

@ -410,7 +410,7 @@ static const struct opc_info {
const char *
disasm_a3xx_instr_name(opc_t opc)
{
if (opc_cat(opc) == -1)
if (opc_cat(opc) == OPC_META)
return "??meta??";
return opcs[opc].name;
}

17
src/freedreno/ir3/instr-a3xx.h
View file

@ -367,9 +367,10 @@ typedef enum {
OPC_DCINV = _OPC(7, 5),
OPC_DCFLU = _OPC(7, 6),
/* meta instructions (category -1): */
/* meta instructions (category 8): */
#define OPC_META 8
/* placeholder instr to mark shader inputs: */
OPC_META_INPUT = _OPC(-1, 0),
OPC_META_INPUT = _OPC(OPC_META, 0),
/* The "collect" and "split" instructions are used for keeping
* track of instructions that write to multiple dst registers
* (split) like texture sample instructions, or read multiple
@ -378,13 +379,13 @@ typedef enum {
* A "split" extracts a scalar component from a vecN, and a
* "collect" gathers multiple scalar components into a vecN
*/
OPC_META_SPLIT = _OPC(-1, 2),
OPC_META_COLLECT = _OPC(-1, 3),
OPC_META_SPLIT = _OPC(OPC_META, 2),
OPC_META_COLLECT = _OPC(OPC_META, 3),
/* placeholder for texture fetches that run before FS invocation
* starts:
*/
OPC_META_TEX_PREFETCH = _OPC(-1, 4),
OPC_META_TEX_PREFETCH = _OPC(OPC_META, 4),
/* Parallel copies have multiple destinations, and copy each destination
* to its corresponding source. This happens "in parallel," meaning that
@ -392,12 +393,12 @@ typedef enum {
* is stored. These are produced in RA when register shuffling is
* required, and then lowered away immediately afterwards.
*/
OPC_META_PARALLEL_COPY = _OPC(-1, 5),
OPC_META_PHI = _OPC(-1, 6),
OPC_META_PARALLEL_COPY = _OPC(OPC_META, 5),
OPC_META_PHI = _OPC(OPC_META, 6),
/*
* A manually encoded opcode
*/
OPC_META_RAW = _OPC(-1, 7)
OPC_META_RAW = _OPC(OPC_META, 7)
} opc_t;
/* clang-format on */

2
src/freedreno/ir3/ir3.c
View file

@ -340,7 +340,7 @@ ir3_collect_info(struct ir3_shader_variant *v)
if (instr->opc == OPC_NOP) {
nops_count = 1 + instr->repeat;
info->instrs_per_cat[0] += nops_count;
} else {
} else if (!is_meta(instr)) {
info->instrs_per_cat[opc_cat(instr->opc)] += 1 + instr->repeat;
info->instrs_per_cat[0] += nops_count;
}

2
src/freedreno/ir3/ir3.h
View file

@ -1139,7 +1139,7 @@ cat4_full_opc(opc_t opc)
static inline bool
is_meta(struct ir3_instruction *instr)
{
return (opc_cat(instr->opc) == -1);
return (opc_cat(instr->opc) == OPC_META);
}
static inline unsigned