diff options
| author | Alyssa Rosenzweig <alyssa@collabora.com> | 2021-07-23 12:41:52 -0400 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2021-07-28 00:26:06 +0000 |
| commit | f9616b74636b2594e7ecab5a504f8d2cf988c973 (patch) | |
| tree | 6cec4b9af1207bc315de98cfe08122a40d1af146 /src | |
| parent | 245c0ec75563e6f060de18aa01000918f60e7fff (diff) | |
pan/bi: Rename NOP.i32 to NOP
Simpler and matches the syntax of Valhall I've picked out.
Signed-off-by: Alyssa Rosenzweig <alyssa@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12026>
Diffstat (limited to 'src')
| -rw-r--r-- | src/panfrost/bifrost/ISA.xml | 4 | ||||
| -rw-r--r-- | src/panfrost/bifrost/bi_packer.c.py | 2 | ||||
| -rw-r--r-- | src/panfrost/bifrost/bi_schedule.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/panfrost/bifrost/ISA.xml b/src/panfrost/bifrost/ISA.xml index e1eb918eef3..d5b61030518 100644 --- a/src/panfrost/bifrost/ISA.xml +++ b/src/panfrost/bifrost/ISA.xml @@ -1986,7 +1986,7 @@ <src start="0" mask="0xfb"/> </ins> - <ins name="*NOP.i32" mask="0x7fffff" exact="0x701963"/> + <ins name="*NOP" mask="0x7fffff" exact="0x701963"/> <ins name="*POPCOUNT.i32" mask="0x7ffff8" exact="0x73c6d8"> <src start="0" mask="0xfb"/> @@ -7395,7 +7395,7 @@ </mod> </ins> - <ins name="+NOP.i32" mask="0xfffff" exact="0x3d964"/> + <ins name="+NOP" mask="0xfffff" exact="0x3d964"/> <ins name="+QUIET.f32" mask="0xffff8" exact="0x3d970"> <src start="0"/> diff --git a/src/panfrost/bifrost/bi_packer.c.py b/src/panfrost/bifrost/bi_packer.c.py index 0c63ed60e59..c014519f5cc 100644 --- a/src/panfrost/bifrost/bi_packer.c.py +++ b/src/panfrost/bifrost/bi_packer.c.py @@ -310,7 +310,7 @@ bi_pack_${'fma' if unit == '*' else 'add'}(bi_instr *I, enum bifrost_packed_src src3) { if (!I) - return bi_pack_${opname_to_c(unit + 'NOP.i32')}(I, src0, src1, src2, src3); + return bi_pack_${opname_to_c(unit + 'NOP')}(I, src0, src1, src2, src3); % if unit == '*': assert((1 << src0) & 0xfb); diff --git a/src/panfrost/bifrost/bi_schedule.c b/src/panfrost/bifrost/bi_schedule.c index 3392c899fb4..89f139e025b 100644 --- a/src/panfrost/bifrost/bi_schedule.c +++ b/src/panfrost/bifrost/bi_schedule.c @@ -1905,7 +1905,7 @@ bi_add_nop_for_atest(bi_context *ctx) * execute */ bi_instr *I = rzalloc(ctx, bi_instr); - I->op = BI_OPCODE_NOP_I32; + I->op = BI_OPCODE_NOP; I->dest[0] = bi_null(); bi_clause *new_clause = ralloc(ctx, bi_clause); |