Mesa (main): freedreno/isa: Fixes for validation
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Fri Oct 15 16:29:51 UTC 2021
Module: Mesa
Branch: main
Commit: 8b0550f09f816063c4f3ab3dbfb03160f0081915
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8b0550f09f816063c4f3ab3dbfb03160f0081915
Author: Rob Clark <robdclark at chromium.org>
Date: Tue Oct 12 10:23:18 2021 -0700
freedreno/isa: Fixes for validation
Signed-off-by: Rob Clark <robdclark at chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13353>
---
src/freedreno/ir3/ir3.h | 2 +-
src/freedreno/isa/ir3-cat6.xml | 6 +++---
src/freedreno/isa/ir3-common.xml | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/freedreno/ir3/ir3.h b/src/freedreno/ir3/ir3.h
index b05b44c8060..76a23ae089d 100644
--- a/src/freedreno/ir3/ir3.h
+++ b/src/freedreno/ir3/ir3.h
@@ -338,7 +338,7 @@ struct ir3_instruction {
* handled.
*/
int dst_offset;
- int iim_val : 3; /* for ldgb/stgb, # of components */
+ int iim_val; /* for ldgb/stgb, # of components */
unsigned d : 3; /* for ldc, component offset */
bool typed : 1;
unsigned base : 3;
diff --git a/src/freedreno/isa/ir3-cat6.xml b/src/freedreno/isa/ir3-cat6.xml
index 73a71bb9942..5deb3287680 100644
--- a/src/freedreno/isa/ir3-cat6.xml
+++ b/src/freedreno/isa/ir3-cat6.xml
@@ -136,12 +136,12 @@ SOFTWARE.
<expr>({OFF_HI} << 8) | {OFF_LO}</expr>
</derived>
- <field low="9" high="13" name="OFF_HI" type="uint"/>
+ <field low="9" high="13" name="OFF_HI" type="int"/>
<field low="32" high="39" name="OFF_LO" type="uint"/>
<pattern pos="52" >0</pattern> <!-- Imm offset stg form -->
<encode>
- <map name="OFF_LO">src->srcs[1]->iim_val</map>
+ <map name="OFF_LO">src->srcs[1]->iim_val & 0xff</map>
<map name="OFF_HI">src->srcs[1]->iim_val >> 8</map>
<map name="SRC3">src->srcs[2]</map>
<map name="SIZE">src->srcs[3]->uim_val</map>
@@ -260,7 +260,7 @@ SOFTWARE.
</derived>
<field low="1" high="8" name="SRC" type="#reg-gpr"/>
- <field low="9" high="13" name="OFF_HI" type="uint"/>
+ <field low="9" high="13" name="OFF_HI" type="int"/>
<pattern low="14" high="22">xxxxxxxxx</pattern>
<pattern pos="23" >1</pattern>
<field low="24" high="31" name="SIZE" type="uint"/>
diff --git a/src/freedreno/isa/ir3-common.xml b/src/freedreno/isa/ir3-common.xml
index 0be7eeb4045..b31ebc1de27 100644
--- a/src/freedreno/isa/ir3-common.xml
+++ b/src/freedreno/isa/ir3-common.xml
@@ -149,7 +149,7 @@ SOFTWARE.
<pattern low="11" high="13">100</pattern>
<field name="ABSNEG" low="14" high="15" type="#absneg"/>
<encode>
- <map name="IMMED">src->uim_val</map>
+ <map name="IMMED">src->iim_val</map>
</encode>
</bitset>
More information about the mesa-commit
mailing list