From: Ben Skeggs <bskeggs@redhat.com>
Date: Sat, 6 Jun 2020 23:51:40 +0000 (+1000)
Subject: nvir: bump max encoding size of instructions
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b80aff88fed60679d2b0ac7fcea29d6cd3ad95ce;p=mesa.git

nvir: bump max encoding size of instructions

SM70 SASS is encoded into 16 bytes.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Karol Herbst <kherbst@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5377>
---

diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir.h b/src/gallium/drivers/nouveau/codegen/nv50_ir.h
index 42ee969c66b..2718975b98a 100644
--- a/src/gallium/drivers/nouveau/codegen/nv50_ir.h
+++ b/src/gallium/drivers/nouveau/codegen/nv50_ir.h
@@ -900,7 +900,7 @@ public:
 
    uint16_t subOp; // quadop, 1 for mul-high, etc.
 
-   unsigned encSize    : 4; // encoding size in bytes
+   unsigned encSize    : 5; // encoding size in bytes
    unsigned saturate   : 1; // to [0.0f, 1.0f]
    unsigned join       : 1; // converge control flow (use OP_JOIN until end)
    unsigned fixed      : 1; // prevent dead code elimination
diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_target.h b/src/gallium/drivers/nouveau/codegen/nv50_ir_target.h
index afeca14d7d1..0f7db116577 100644
--- a/src/gallium/drivers/nouveau/codegen/nv50_ir_target.h
+++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_target.h
@@ -200,7 +200,7 @@ public:
       uint8_t dstMods;
       uint16_t srcFiles[3];
       uint16_t dstFiles;
-      unsigned int minEncSize  : 4;
+      unsigned int minEncSize  : 5;
       unsigned int vector      : 1;
       unsigned int predicate   : 1;
       unsigned int commutative : 1;