fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-03 12:08:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

ir3/a7xx: Add definitions for (last) src GPR attribute

Browse source 
A new attribute on source GPRs reflecting if a certain usage of a
value is the last usage of it was added in A7xx. This is seemingly
a performance hint and doesn't affect anything when not applied.

Signed-off-by: Mark Collins <mark@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21498>
This commit is contained in:
Mark Collins 2023-04-12 09:04:01 +00:00 • committed by Marge Bot
parent 1613d767c1
commit 85c6c9068a
8 changed files with 43 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/freedreno/.gitlab-ci/reference/prefetch-test.log
View file

@ -149159,8 +149159,13 @@ shader-blocks:
:4:0049:0061[821c4006x_20905a42x] no match: 821c400620905a42
:5:0050:0062[b002819cx_d601061dx] (sy)isam.a (f16)(x)hr39.x, r3.z, s#0, t#107 ; WARNING: unexpected bits[47:47] in #instruction-cat5: 0000000000000001 vs 0000000000000000, WARNING: unexpected bits[0:7] in #cat5-src2: 0000000000000083 vs 0000000000000000
:0:0051:0063[19d70515x_81d857bex] no match: 19d7051581d857be
:3:0052:0064[7972f999x_e4df0ecbx] (sy)(ss)(jp)(rpt1)(ul)mad.s16 r38.y, (r)hc<a0.x + -309>, (neg)hr57.y, (neg)(r) ; no match: FIELD: 'mad.s16.SRC3': 00000000000004df
:3:0052:0064[7972f999x_e4df0ecbx] (sy)(ss)(jp)(rpt1)(ul)mad.s16 r38.y, (r)hc<a0.x + -309>, (neg)hr57.y, (neg)(r)(last)hr55.w
:6:0053:0066[dda7eb4fx_f96f6ddfx] no match: dda7eb4ff96f6ddf
:5:0054:0067[a4e7fe75x_ab4ffb7fx] no match: a4e7fe75ab4ffb7f
:6:0055:0068[d1937f77x_effcfeefx] no match: d1937f77effcfeef
:0:0056:0069[1134c8d0x_34200204x] (sy)jump #874512900 ; dontcare bits in jump: 0034c8d000000000
:5:0057:0070[ac44c0eax_60215b2ex] (jp)gather4g.s (s16)()hr58.z, hr37.w, s#1, t#48 ; WARNING: unexpected bits[47:47] in #instruction-cat5: 0000000000000001 vs 0000000000000000, WARNING: unexpected bits[0:7] in #cat5-src2: 00000000000000ad vs 0000000000000000
:3:0058:0071[6808c080x_2078f048x] no match: 6808c0802078f048
-----------------------------------------------
8192 (0x2000) bytes
000000: 0000001e 03820000 0000001d 02820000 |................|

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

@ -160,6 +160,12 @@ typedef enum ir3_register_flags {
* interferes with the sources of the instruction.
*/
IR3_REG_EARLY_CLOBBER = BIT(17),
/* If this is the last usage of a specific value in the register, the
* register cannot be read without being written to first after this.
* Note: This effectively has the same semantics as IR3_REG_KILL.
*/
IR3_REG_LAST_USE = BIT(18),
} ir3_register_flags;
struct ir3_register {

1
src/freedreno/ir3/ir3_lexer.l
View file

@ -115,6 +115,7 @@ static int parse_reg(const char *str)
"(neg)" return TOKEN(T_NEG);
"(abs)" return TOKEN(T_ABS);
"(r)" return TOKEN(T_R);
"(last)" return TOKEN(T_LAST);
"(ul)" return TOKEN(T_UL);
"(even)" return TOKEN(T_EVEN);
"(pos_infinity)" return TOKEN(T_POS_INFINITY);

2
src/freedreno/ir3/ir3_parser.y
View file

@ -343,6 +343,7 @@ static void print_token(FILE *file, int type, YYSTYPE value)
%token <tok> T_NEG
%token <tok> T_ABS
%token <tok> T_R
%token <tok> T_LAST
%token <tok> T_HR
%token <tok> T_HC
@ -1364,6 +1365,7 @@ src_reg_flag: T_ABSNEG { rflags.flags |= IR3_REG_ABS|IR3_REG_NEGATE;
| T_NEG { rflags.flags |= IR3_REG_NEGATE; }
| T_ABS { rflags.flags |= IR3_REG_ABS; }
| T_R { rflags.flags |= IR3_REG_R; }
| T_LAST { rflags.flags |= IR3_REG_LAST_USE; }
src_reg_flags: src_reg_flag
| src_reg_flag src_reg_flags

8
src/freedreno/ir3/tests/disasm.c
View file

@ -103,6 +103,8 @@ static const struct test {
INSTR_6XX(20400006_00003800, "mov.f16f16 hr1.z, h(0.500000)"),
INSTR_6XX(204880f5_00000000, "mova1 a1.x, 0"),
INSTR_7XX(2004c005_00000405, "cov.f32u32 r1.y, (last)r1.y"),
/* cat2 */
INSTR_6XX(40104002_0c210001, "add.f hr0.z, r0.y, c<a0.x + 33>"),
INSTR_6XX(40b80804_10408004, "(nop3) cmps.f.lt r1.x, (abs)r1.x, c16.x"),
@ -120,6 +122,9 @@ static const struct test {
INSTR_6XX(46b00001_00001020, "clz.b r0.y, c8.x"),
INSTR_6XX(46700009_00000009, "bfrev.b r2.y, r2.y"),
INSTR_7XX(42380800_04010400, "(nop3) add.s r0.x, (last)r0.x, (last)r0.y"),
INSTR_7XX(42930000_04000406, "cmps.u.ge r0.x, (last)r1.z, (last)r0.x"),
/* cat3 */
INSTR_6XX(66000000_10421041, "sel.f16 hr0.x, hc16.y, hr0.x, hc16.z"),
INSTR_6XX(64848109_109a9099, "(rpt1)sel.b32 r2.y, c38.y, (r)r2.y, c38.z"),
@ -143,6 +148,9 @@ static const struct test {
INSTR_6XX(66818c02_0002e003, "(sat)(nop3) dp2acc.mixed.low r0.z, r0.w, r0.w, r0.z"), /* (nop3) dp2acc (sat)r0.z, (signed)(low)(r)r0.w, (low)(r)r0.w, r0.z */
INSTR_6XX(6681c802_8002a003, "(nop3) dp4acc.unsigned.low r0.z, r0.w, r0.w, (neg)r0.z"), /* (nop3) dp4acc r0.z, (unsigned)(r)r0.w, (r)r0.w, (neg)r0.z */
INSTR_7XX(61808000_04020400, "madsh.m16 r0.x, (last)r0.x, r0.y, (last)r0.z"),
INSTR_7XX(64838806_04088406, "(nop3) sel.b32 r1.z, (last)r1.z, r1.w, (last)r2.x"),
/* cat4 */
INSTR_6XX(8010000a_00000003, "rcp r2.z, r0.w"),

10
src/freedreno/isa/ir3-cat1.xml
View file

@ -223,7 +223,7 @@ SOFTWARE.
<bitset name="#cat1-gpr-src" size="8">
<display>
{SRC_R}{HALF}{SRC}
{LAST}{SRC_R}{HALF}{SRC}
</display>
<field name="SRC" low="0" high="7" type="#reg-gpr"/>
<encode type="struct ir3_register *">
@ -275,12 +275,18 @@ SOFTWARE.
<bitset name="mov-gpr" extends="#instruction-cat1-mov">
<field name="SRC" low="0" high="7" type="#cat1-gpr-src">
<param name="LAST"/>
<param name="SRC_R"/>
<param name="HALF"/>
</field>
<pattern low="8" high="31">000000000000000000000000</pattern>
<pattern low="8" high="9">00</pattern>
<field name="LAST" pos="10" type="bool" display="(last)"/>
<pattern low="11" high="31">000000000000000000000</pattern>
<field name="SRC_R" pos="43" type="bool" display="(r)"/>
<pattern low="53" high="54">00</pattern>
<encode>
<map name="LAST">!!(src->srcs[0]->flags &amp; IR3_REG_LAST_USE)</map>
</encode>
</bitset>
<bitset name="#instruction-cat1-relative" extends="#instruction-cat1-mov">

7
src/freedreno/isa/ir3-cat3.xml
View file

@ -40,12 +40,15 @@ SOFTWARE.
<bitset name="#cat3-src-gpr" extends="#cat3-src">
<display>
{HALF}{SRC}
{LAST}{HALF}{SRC}
</display>
<field name="SRC" low="0" high="7" type="#reg-gpr"/>
<pattern low="8" high="12">00000</pattern>
<pattern low="8" high="9">00</pattern>
<field name="LAST" pos="10" type="bool" display="(last)"/>
<pattern low="11" high="12">00</pattern>
<encode>
<map name="SRC">src</map>
<map name="LAST">!!(src->flags &amp; IR3_REG_LAST_USE)</map>
</encode>
</bitset>

9
src/freedreno/isa/ir3-common.xml
View file

@ -199,12 +199,17 @@ SOFTWARE.
<bitset name="#multisrc-gpr" extends="#multisrc">
<display>
{ABSNEG}{SRC_R}{HALF}{SRC}
{LAST}{ABSNEG}{SRC_R}{HALF}{SRC}
</display>
<derived name="HALF" expr="#multisrc-half" type="bool" display="h"/>
<field name="SRC" low="0" high="7" type="#reg-gpr"/>
<pattern low="8" high="13">000000</pattern>
<pattern low="8" high="9">00</pattern>
<field name="LAST" pos="10" type="bool" display="(last)"/>
<pattern low="11" high="13">000</pattern>
<field name="ABSNEG" low="14" high="15" type="#absneg"/>
<encode>
<map name="LAST">!!(src->flags &amp; IR3_REG_LAST_USE)</map>
</encode>
</bitset>
<bitset name="#multisrc-const" extends="#multisrc">