From 9425ba6f2bc492db0db55b37610fa22dd251ced0 Mon Sep 17 00:00:00 2001
From: Hyunjun Ko <zzoon@igalia.com>
Date: Wed, 20 Sep 2023 16:23:32 +0900
Subject: [PATCH] intel/genxml: update VDENC instructions

Signed-off-by: Hyunjun Ko <zzoon@igalia.com>
Acked-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27810>
---
 src/intel/genxml/gen11.xml |  57 +++++++-----------
 src/intel/genxml/gen12.xml | 115 +++++++++++++++++++++++++++++++++++++
 src/intel/genxml/gen9.xml  |  90 ++++++++++++++++++++---------
 3 files changed, 200 insertions(+), 62 deletions(-)

diff --git a/src/intel/genxml/gen11.xml b/src/intel/genxml/gen11.xml
index d0add0c88ea..2a247a0fce7 100644
--- a/src/intel/genxml/gen11.xml
+++ b/src/intel/genxml/gen11.xml
@@ -458,8 +458,7 @@
     <field name="Half Pitch for Chroma" start="34" end="34" type="bool" />
     <field name="Surface Pitch" start="35" end="51" type="uint" />
     <field name="Chroma Downsample Filter Control" start="52" end="54" type="uint" />
-    <field name="Format" start="59" end="63" type="uint" />
-    <field name="Surface Format" start="60" end="63" type="uint" prefix="VDENC">
+    <field name="Surface Format" start="59" end="63" type="uint" prefix="VDENC">
       <value name="YUV 4:2:2" value="0" />
       <value name="RGBA 4:4:4:4" value="1" />
       <value name="YUV 4:4:4" value="2" />
@@ -2920,8 +2919,8 @@
     <field name="8X Surface State" start="64" end="191" type="VDENC_SURFACE_STATE_FIELDS" />
     <field name="4X Surface State" start="192" end="319" type="VDENC_SURFACE_STATE_FIELDS" />
   </instruction>
-  <instruction name="VDENC_IMG_STATE" bias="2" length="36" engine="video">
-    <field name="DWord Length" start="0" end="11" type="uint" default="34" />
+  <instruction name="VDENC_IMG_STATE" bias="2" length="35" engine="video">
+    <field name="DWord Length" start="0" end="11" type="uint" default="33" />
     <field name="SubOpcode B" start="16" end="20" type="uint" default="5" />
     <field name="SubOpcode A" start="21" end="22" type="uint" default="0" />
     <field name="Media Command Opcode" start="23" end="26" type="uint" default="1" />
@@ -2936,10 +2935,12 @@
     <field name="Transform 8x8" start="39" end="39" type="bool" />
     <field name="VDEnc L1 Cache Priority" start="40" end="41" type="uint" />
     <field name="Lambda Value for Trellis" start="48" end="63" type="uint" />
+    <field name="Bidirectional Weight" start="80" end="85" type="uint" />
     <field name="Unidirectional Mix Disable" start="92" end="92" type="bool" />
     <field name="Picture Width" start="112" end="127" type="uint" />
     <field name="Sub-Pel Mode" start="140" end="141" type="uint" />
     <field name="Forward Transform Skip Check Enable" start="145" end="145" type="bool" />
+    <field name="Bme Disable For Fbr Message" start="146" end="146" type="bool" />
     <field name="Block-Based Skip Enable" start="147" end="147" type="bool" />
     <field name="Inter SAD Measure Adjustment" start="148" end="149" type="uint" prefix="ISMA">
       <value name="None" value="0" />
@@ -2989,7 +2990,7 @@
     <field name="RefID Cost" start="368" end="375" type="uint" />
     <field name="Chroma Intra Mode Cost" start="376" end="383" type="uint" />
     <field name="MV Cost" start="384" end="447" type="IMAGE_STATE_COST" />
-    <field name="QpPrimeY" start="448" end="455" type="uint" />
+    <field name="QpPrimeY" start="448" end="455" type="int" />
     <field name="TargetSizeInWord" start="472" end="479" type="uint" />
     <field name="AVC Intra 4x4 Mode Mask" start="544" end="552" type="uint" />
     <field name="AVC Intra 8x8 Mode Mask" start="560" end="568" type="uint" />
@@ -3032,8 +3033,8 @@
     <field name="Sad/Haar Threshold 0" start="1008" end="1023" type="uint" />
     <field name="Sad/Haar Threshold 1" start="1024" end="1039" type="uint" />
     <field name="Sad/Haar Threshold 2" start="1040" end="1055" type="uint" />
-    <field name="Min QP" start="1056" end="1063" type="uint" />
-    <field name="Max QP" start="1064" end="1071" type="uint" />
+    <field name="Max QP" start="1056" end="1063" type="uint" />
+    <field name="Min QP" start="1064" end="1071" type="uint" />
     <field name="Max Delta QP" start="1080" end="1083" type="uint" />
     <field name="ROI Enable" start="1088" end="1088" type="bool" />
     <field name="Fwd/Predictor0 MV Enable" start="1089" end="1089" type="bool" />
@@ -3048,8 +3049,8 @@
     <field name="Long Term Reference Frame Fwd Ref0 Indicator" start="1101" end="1101" type="bool" />
     <field name="Midpoint Sad/Haar" start="1104" end="1119" type="uint" />
   </instruction>
-  <instruction name="VDENC_PIPE_BUF_ADDR_STATE" bias="2" length="38" engine="video">
-    <field name="DWord Length" start="0" end="11" type="uint" default="36" />
+  <instruction name="VDENC_PIPE_BUF_ADDR_STATE" bias="2" length="62" engine="video">
+    <field name="DWord Length" start="0" end="11" type="uint" default="60" />
     <field name="SubOpcode B" start="16" end="20" type="uint" default="4" />
     <field name="SubOpcode A" start="21" end="22" type="uint" default="0" />
     <field name="Media Command Opcode" start="23" end="26" type="uint" default="1" />
@@ -3068,15 +3069,16 @@
     <field name="VDEnc Statistics Stream-Out" start="1088" end="1183" type="VDENC_PICTURE" />
     <field name="DS FWD REF0 4X" start="1184" end="1279" type="VDENC_PICTURE" />
     <field name="DS FWD REF1 4X" start="1280" end="1375" type="VDENC_PICTURE" />
-    <field name="VDEnc LCU PAK_OBJ_CMD Buffer" start="1472" end="1567" type="VDENC_PICTURE" />
-    <field name="Scaled Reference Surface 8X" start="1568" end="1663" type="VDENC_PICTURE" />
-    <field name="Scaled Reference Surface 4X" start="1664" end="1759" type="VDENC_PICTURE" />
-    <field name="VP9 Segmentation Map Stream-In Buffer" start="1760" end="1855" type="VDENC_PICTURE" />
-    <field name="VP9 Segmentation Map Stream-Out Buffer" start="1856" end="1951" type="VDENC_PICTURE" />
-    <field name="Weights Histogram Stream-Out Offset" start="1952" end="1983" type="uint" />
+    <field name="VDEnc CU Record Stream-Out Buffer" start="1472" end="1567" type="VDENC_PICTURE" />
+    <field name="VDEnc LCU PAK_OBJ_CMD Buffer" start="1568" end="1663" type="VDENC_PICTURE" />
+    <field name="Scaled Reference Surface 8X" start="1664" end="1759" type="VDENC_PICTURE" />
+    <field name="Scaled Reference Surface 4X" start="1760" end="1855" type="VDENC_PICTURE" />
+    <field name="VP9 Segmentation Map Stream-In Buffer" start="1856" end="1951" type="VDENC_PICTURE" />
+    <field name="VP9 Segmentation Map Stream-Out Buffer" start="1952" end="1983" type="VDENC_PICTURE" />
+    <field name="Weights Histogram Stream-Out Offset" start="1984" end="2079" type="uint" />
   </instruction>
-  <instruction name="VDENC_PIPE_MODE_SELECT" bias="2" length="2" engine="video">
-    <field name="DWord Length" start="0" end="11" type="uint" default="0" />
+  <instruction name="VDENC_PIPE_MODE_SELECT" bias="2" length="6" engine="video">
+    <field name="DWord Length" start="0" end="11" type="uint" default="4" />
     <field name="SubOpcode B" start="16" end="20" type="uint" default="0" />
     <field name="SubOpcode A" start="21" end="22" type="uint" default="0" />
     <field name="Media Command Opcode" start="23" end="26" type="uint" default="1" />
@@ -3105,24 +3107,9 @@
     </field>
     <field name="Output Range Control After Color Space Conversion" start="49" end="49" type="bool" />
     <field name="Disable Speed Mode Fetch Optimization" start="63" end="63" type="bool" />
-    <field name="HME Region Prefetch Enable" start="64" end="64" type="bool" />
-    <field name="Top Prefetch Enable Mode" start="65" end="66" type="uint" />
-    <field name="Left Prefetch At Wrap Around" start="67" end="67" type="bool" />
-    <field name="VerticalShift32Minus1" start="68" end="71" type="uint" />
-    <field name="HzShift32Minus1" start="72" end="75" type="uint" />
-    <field name="Number of Vertical Requests" start="80" end="83" type="uint" />
-    <field name="Number of Horizontal Requests" start="84" end="87" type="uint" />
-    <field name="Prefetch Offset for Reference" start="88" end="91" type="uint" />
-    <field name="Source Luma/Packed Data TLB Prefetch Enable" start="96" end="96" type="bool" />
-    <field name="Source Chroma TLB Prefetch Enable" start="97" end="97" type="bool" />
-    <field name="VerticalShift32Minus1Src" start="100" end="103" type="uint" />
-    <field name="HzShift32Minus1Src" start="104" end="107" type="uint" />
-    <field name="Number of Vertical Requests for Source" start="112" end="115" type="uint" />
-    <field name="Number of Horizontal Request for Source" start="116" end="119" type="uint" />
-    <field name="Prefetch Offset for Source" start="120" end="123" type="uint" />
   </instruction>
-  <instruction name="VDENC_WALKER_STATE" bias="2" length="2" engine="video">
-    <field name="DWord Length" start="0" end="11" type="uint" default="0" />
+  <instruction name="VDENC_WALKER_STATE" bias="2" length="10" engine="video">
+    <field name="DWord Length" start="0" end="11" type="uint" default="8" />
     <field name="SubOpcode B" start="16" end="20" type="uint" default="7" />
     <field name="SubOpcode A" start="21" end="22" type="uint" default="0" />
     <field name="Media Command Opcode" start="23" end="26" type="uint" default="1" />
@@ -3150,7 +3137,7 @@
     <field name="Tile LCU Stream-Out Offset Enable" start="288" end="288" type="bool" />
     <field name="Tile LCU Stream-Out Offset" start="294" end="319" type="uint" />
   </instruction>
-  <instruction name="VDENC_WEIGHTSOFFSETS_STATE" bias="2" length="2" engine="video">
+  <instruction name="VDENC_WEIGHTSOFFSETS_STATE" bias="2" length="3" engine="video">
     <field name="DWord Length" start="0" end="11" type="uint" default="1" />
     <field name="SubOpcode B" start="16" end="20" type="uint" default="8" />
     <field name="SubOpcode A" start="21" end="22" type="uint" default="0" />
diff --git a/src/intel/genxml/gen12.xml b/src/intel/genxml/gen12.xml
index f64271f9d52..1bbbe32c735 100644
--- a/src/intel/genxml/gen12.xml
+++ b/src/intel/genxml/gen12.xml
@@ -1323,6 +1323,121 @@
     <field name="Address" start="66" end="111" type="address" />
     <field name="Immediate Data" start="128" end="191" type="uint" />
   </instruction>
+  <instruction name="VDENC_PIPE_BUF_ADDR_STATE" bias="2" length="71" engine="video">
+    <field name="DWord Length" start="0" end="11" type="uint" default="69" />
+    <field name="SubOpcode B" start="16" end="20" type="uint" default="4" />
+    <field name="SubOpcode A" start="21" end="22" type="uint" default="0" />
+    <field name="Media Command Opcode" start="23" end="26" type="uint" default="1" />
+    <field name="Pipeline" start="27" end="28" type="uint" default="2" />
+    <field name="Command Type" start="29" end="31" type="uint" default="3" />
+    <field name="DS FWD REF0" start="32" end="127" type="VDENC_PICTURE" />
+    <field name="DS FWD REF1" start="128" end="223" type="VDENC_PICTURE" />
+    <field name="Original Uncompressed Picture" start="320" end="415" type="VDENC_PICTURE" />
+    <field name="Stream-In Data Picture" start="416" end="511" type="VDENC_PICTURE" />
+    <field name="Row Store Scratch Buffer" start="512" end="607" type="VDENC_PICTURE" />
+    <field name="Colocated MV Read Buffer" start="608" end="703" type="VDENC_PICTURE" />
+    <field name="FWD REF0" start="704" end="799" type="VDENC_PICTURE" />
+    <field name="FWD REF1" start="800" end="895" type="VDENC_PICTURE" />
+    <field name="FWD REF2" start="896" end="991" type="VDENC_PICTURE" />
+    <field name="BWD REF0" start="992" end="1087" type="VDENC_PICTURE" />
+    <field name="VDEnc Statistics Stream-Out" start="1088" end="1183" type="VDENC_PICTURE" />
+    <field name="DS FWD REF0 4X" start="1184" end="1279" type="VDENC_PICTURE" />
+    <field name="DS FWD REF1 4X" start="1280" end="1375" type="VDENC_PICTURE" />
+    <field name="VDEnc CU Record Stream-Out Buffer" start="1472" end="1567" type="VDENC_PICTURE" />
+    <field name="VDEnc LCU PAK_OBJ_CMD Buffer" start="1568" end="1663" type="VDENC_PICTURE" />
+    <field name="Scaled Reference Surface 8X" start="1664" end="1759" type="VDENC_PICTURE" />
+    <field name="Scaled Reference Surface 4X" start="1760" end="1855" type="VDENC_PICTURE" />
+    <field name="VP9 Segmentation Map Stream-In Buffer" start="1856" end="1951" type="VDENC_PICTURE" />
+    <field name="VP9 Segmentation Map Stream-Out Buffer" start="1952" end="1983" type="VDENC_PICTURE" />
+    <field name="Weights Histogram Stream-Out Offset" start="1984" end="2079" type="uint" />
+    <field name="VDEnc Tile Row Store Buffer" start="2080" end="2175" type="VDENC_PICTURE" />
+    <field name="VDEnc Cumulative CU Count Stream-Out Surface" start="2176" end="2271" type="VDENC_PICTURE" />
+    <field name="VDEnc Palette Mode Stream-Out Surface" start="2272" end="2367" type="VDENC_PICTURE" />
+  </instruction>
+  <instruction name="VDENC_PIPE_MODE_SELECT" bias="2" length="6" engine="video">
+    <field name="DWord Length" start="0" end="11" type="uint" default="4" />
+    <field name="SubOpcode B" start="16" end="20" type="uint" default="0" />
+    <field name="SubOpcode A" start="21" end="22" type="uint" default="0" />
+    <field name="Media Command Opcode" start="23" end="26" type="uint" default="1" />
+    <field name="Pipeline" start="27" end="28" type="uint" default="2" />
+    <field name="Command Type" start="29" end="31" type="uint" default="3" />
+    <field name="Standard Select" start="32" end="35" type="uint" prefix="SS">
+      <value name="HEVC" value="0" />
+      <value name="VP9" value="1" />
+      <value name="AVC" value="2" />
+    </field>
+    <field name="Scalability Mode" start="36" end="36" type="bool" />
+    <field name="Frame Statistics Stream-Out Enable" start="37" end="37" type="bool" />
+    <field name="VDEnc PAK_OBJ_CMD Stream-Out Enable" start="38" end="38" type="bool" />
+    <field name="TLB Prefetch Enable" start="39" end="39" type="bool" />
+    <field name="PAK Threshold Check Enable" start="40" end="40" type="bool" />
+    <field name="VDEnc Stream-In Enable" start="41" end="41" type="bool" />
+    <field name="DownScaled 8x Write Disable" start="42" end="42" type="bool" />
+    <field name="DownScaled 4x Write Disable" start="43" end="43" type="bool" />
+    <field name="Bit Depth" start="44" end="46" type="uint">
+      <value name="8-bit" value="0" />
+      <value name="10-bit" value="2" />
+    </field>
+    <field name="PAK Chroma Sub-Sampling Type" start="47" end="48" type="uint">
+      <value name="4:2:0" value="1" />
+      <value name="4:4:4" value="3" />
+    </field>
+    <field name="Output Range Control After Color Space Conversion" start="49" end="49" type="bool" />
+    <field name="Is Random Access" start="50" end="50" type="bool" />
+    <field name="RGB Encoding Enable" start="52" end="52" type="bool" />
+    <field name="Primary Channel Selection For RGB Encoding" start="53" end="54" type="uint" default="1" />
+    <field name="First Secondary Channel Selection For RGB Encoding" start="55" end="56" type="uint" default="2" />
+    <field name="Tile Replay Enable" start="57" end="57" type="bool" />
+    <field name="Streaming Buffer Config" start="58" end="59" type="uint" />
+    <field name="Disable Speed Mode Fetch Optimization" start="63" end="63" type="bool" />
+    <field name="HME Region Prefetch Enable" start="64" end="64" type="bool" default="1" />
+    <field name="Top Prefetch Enable Mode" start="65" end="66" type="uint" default="1" />
+    <field name="Left Prefetch At Wrap Around" start="67" end="67" type="bool" default="1" />
+    <field name="VerticalShift32Minus1" start="68" end="71" type="uint" />
+    <field name="HzShift32Minus1" start="72" end="75" type="uint" default="3" />
+    <field name="Number of Vertical Requests" start="80" end="83" type="uint" default="11" />
+    <field name="Number of Horizontal Requests" start="84" end="87" type="uint" default="2" />
+    <field name="Prefetch Offset for Reference" start="88" end="91" type="uint" />
+    <field name="Source Luma/Packed Data TLB Prefetch Enable" start="96" end="96" type="bool" default="1" />
+    <field name="Source Chroma TLB Prefetch Enable" start="97" end="97" type="bool" default="1" />
+    <field name="VerticalShift32Minus1Src" start="100" end="103" type="uint" />
+    <field name="HzShift32Minus1Src" start="104" end="107" type="uint" default="3" />
+    <field name="Number of Vertical Requests for Source" start="112" end="115" type="uint" />
+    <field name="Number of Horizontal Request for Source" start="116" end="119" type="uint" />
+    <field name="Prefetch Offset for Source" start="120" end="123" type="uint" default="4" />
+  </instruction>
+  <instruction name="VDENC_WALKER_STATE" bias="2" length="27" engine="video">
+    <field name="DWord Length" start="0" end="11" type="uint" default="25" />
+    <field name="SubOpcode B" start="16" end="20" type="uint" default="7" />
+    <field name="SubOpcode A" start="21" end="22" type="uint" default="0" />
+    <field name="Media Command Opcode" start="23" end="26" type="uint" default="1" />
+    <field name="Pipeline" start="27" end="28" type="uint" default="2" />
+    <field name="Command Type" start="29" end="31" type="uint" default="3" />
+    <field name="MB/LCU Start Y Position" start="32" end="40" type="uint" />
+    <field name="MB/LCU Start X Position" start="48" end="56" type="uint" />
+    <field name="First Super Slice" start="60" end="60" type="bool" />
+    <field name="Next Slice MB Start Y Position" start="64" end="73" type="uint" />
+    <field name="Next Slice MB/LCU Start X Position" start="80" end="89" type="uint" />
+    <field name="Log2 Weight Denominator Luma" start="96" end="98" type="uint" />
+    <field name="HEVC/VP9 Log2 Weight Denominator Luma" start="100" end="102" type="uint" />
+    <field name="Number of Parallel Engines" start="105" end="106" type="uint" />
+    <field name="Tile Number" start="120" end="127" type="uint" />
+    <field name="Tile Start CTB-Y" start="128" end="143" type="uint" />
+    <field name="Tile Start CTB-X" start="144" end="159" type="uint" />
+    <field name="Tile Width" start="160" end="175" type="uint" />
+    <field name="Tile Height" start="176" end="191" type="uint" />
+    <field name="Tile Stream-In Offset Enable" start="192" end="192" type="bool" />
+    <field name="Tile Stream-In Offset" start="198" end="223" type="uint" />
+    <field name="Tile Row Store Offset Enable" start="224" end="224" type="bool" />
+    <field name="Tile Row Store Offset" start="230" end="255" type="uint" />
+    <field name="Tile Stream-Out Offset Enable" start="256" end="256" type="bool" />
+    <field name="Tile Stream-Out Offset" start="262" end="287" type="uint" />
+    <field name="Tile LCU Stream-Out Offset Enable" start="288" end="288" type="bool" />
+    <field name="Tile LCU Stream-Out Offset" start="294" end="319" type="uint" />
+    <field name="Palette Mode Enable" start="410" end="410" type="bool" />
+    <field name="IBC Control" start="411" end="412" type="uint" />
+    <field name="Adaptive Channel Threshold" start="536" end="539" type="uint" />
+  </instruction>
   <instruction name="VD_CONTROL_STATE" bias="2" length="3" engine="video">
     <field name="DWord Length" start="0" end="11" type="uint" default="1" />
     <field name="SubOpcode" start="16" end="22" type="uint" default="10" />
diff --git a/src/intel/genxml/gen9.xml b/src/intel/genxml/gen9.xml
index 1d83adec18f..fee514dbb8e 100644
--- a/src/intel/genxml/gen9.xml
+++ b/src/intel/genxml/gen9.xml
@@ -164,6 +164,16 @@
     <field name="Address" start="0" end="63" type="address" />
     <field name="Memory Address Attributes" start="64" end="95" type="MEMORYADDRESSATTRIBUTES" />
   </struct>
+  <struct name="IMAGE_STATE_COST" length="2">
+    <field name="MV 0 Cost" start="0" end="7" type="uint" />
+    <field name="MV 1 Cost" start="8" end="15" type="uint" />
+    <field name="MV 2 Cost" start="16" end="23" type="uint" />
+    <field name="MV 3 Cost" start="24" end="31" type="uint" />
+    <field name="MV 4 Cost" start="32" end="39" type="uint" />
+    <field name="MV 5 Cost" start="40" end="47" type="uint" />
+    <field name="MV 6 Cost" start="48" end="55" type="uint" />
+    <field name="MV 7 Cost" start="56" end="63" type="uint" />
+  </struct>
   <struct name="INLINE_DATA_DESCRIPTION_FOR_MFD_AVC_BSD_OBJECT" length="3">
     <field name="MB Error Concealment P Slice Weight Prediction Disable" start="0" end="0" type="bool" />
     <field name="MB Error Concealment P Slice Motion Vectors Override Disable" start="1" end="1" type="bool" />
@@ -656,7 +666,7 @@
     <field name="Tiled Surface" start="33" end="33" type="uint" />
     <field name="Half Pitch for Chroma" start="34" end="34" type="bool" />
     <field name="Surface Pitch" start="35" end="51" type="uint" />
-    <field name="Format" start="59" end="63" type="uint" />
+    <field name="Interleave Chroma" start="59" end="59" type="uint" />
     <field name="Surface Format" start="60" end="63" type="uint" prefix="VDENC">
       <value name="YUV 4:2:2" value="0" />
       <value name="RGBA 4:4:4:4" value="1" />
@@ -3832,19 +3842,31 @@
     <field name="Bindless Surface State Base Address" start="524" end="575" type="address" />
     <field name="Bindless Surface State Size" start="588" end="607" type="uint" />
   </instruction>
-  <instruction name="VDENC_CONST_QPT_STATE" bias="2" length="62" engine="video">
-    <field name="DWord Length" start="0" end="11" type="uint" default="60" />
+  <instruction name="VDENC_CONST_QPT_STATE" bias="2" length="61" engine="video">
+    <field name="DWord Length" start="0" end="11" type="uint" default="59" />
     <field name="SubOpcode B" start="16" end="20" type="uint" default="6" />
     <field name="SubOpcode A" start="21" end="22" type="uint" default="0" />
     <field name="Media Command Opcode" start="23" end="26" type="uint" default="1" />
     <field name="Pipeline" start="27" end="28" type="uint" default="2" />
     <field name="Command Type" start="29" end="31" type="uint" default="3" />
-    <field name="QP Lambda Array Index[n]" start="32" end="39" type="uint" />
-    <field name="Skip Threshold Array Index[n]" start="384" end="399" type="uint" />
-    <field name="SIC Forward Transform Coeff Threshold Matrix0 Array Index[n]" start="832" end="847" type="uint" />
-    <field name="SIC Forward Transform Coeff Threshold Matrix1/3/5 Array Index[n]" start="1280" end="1287" type="uint" />
-    <field name="SIC Forward Transform Coeff Threshold Matrix2 Array Index[n]" start="1504" end="1511" type="uint" />
-    <field name="SIC Forward Transform Coeff Threshold Matrix4/6 Array Index[n]" start="1728" end="1735" type="uint" />
+    <group count="42" start="32" size="8">
+      <field name="QP Lambda Array Index" start="0" end="7" type="uint" />
+    </group>
+    <group count="27" start="384" size="16">
+      <field name="Skip Threshold Array Index" start="0" end="15" type="uint" />
+    </group>
+    <group count="27" start="832" size="16">
+      <field name="SIC Forward Transform Coeff Threshold Matrix0 Array Index" start="0" end="15" type="uint" />
+    </group>
+    <group count="27" start="1280" size="8">
+      <field name="SIC Forward Transform Coeff Threshold Matrix1/3/5 Array Index" start="0" end="7" type="uint" />
+    </group>
+    <group count="27" start="1504" size="8">
+      <field name="SIC Forward Transform Coeff Threshold Matrix2 Array Index" start="0" end="7" type="uint" />
+    </group>
+    <group count="27" start="1728" size="8">
+      <field name="SIC Forward Transform Coeff Threshold Matrix4/6 Array Index" start="0" end="7" type="uint" />
+    </group>
   </instruction>
   <instruction name="VDENC_DS_REF_SURFACE_STATE" bias="2" length="6" engine="video">
     <field name="DWord Length" start="0" end="11" type="uint" default="4" />
@@ -3855,22 +3877,24 @@
     <field name="Command Type" start="29" end="31" type="uint" default="3" />
     <field name="8X Surface State" start="64" end="191" type="VDENC_SURFACE_STATE_FIELDS" />
   </instruction>
-  <instruction name="VDENC_IMG_STATE" bias="2" length="36" engine="video">
-    <field name="DWord Length" start="0" end="11" type="uint" default="34" />
+  <instruction name="VDENC_IMG_STATE" bias="2" length="35" engine="video">
+    <field name="DWord Length" start="0" end="11" type="uint" default="33" />
     <field name="SubOpcode B" start="16" end="20" type="uint" default="5" />
     <field name="SubOpcode A" start="21" end="22" type="uint" default="0" />
     <field name="Media Command Opcode" start="23" end="26" type="uint" default="1" />
     <field name="Pipeline" start="27" end="28" type="uint" default="2" />
     <field name="Command Type" start="29" end="31" type="uint" default="3" />
     <field name="Bidirectional Mix Disable" start="34" end="34" type="bool" />
-    <field name="VDEnc Extended PAK_OBJ_ Command Enable" start="38" end="38" type="bool" />
+    <field name="VDEnc Extended PAK_OBJ_CMD Enable" start="38" end="38" type="bool" />
     <field name="Transform 8x8" start="39" end="39" type="bool" />
     <field name="VDEnc L1 Cache Priority" start="40" end="41" type="uint" />
     <field name="Lambda Value for Trellis" start="48" end="63" type="uint" />
+    <field name="Bidirectional Weight" start="80" end="85" type="uint" />
     <field name="Unidirectional Mix Disable" start="92" end="92" type="bool" />
     <field name="Picture Width" start="112" end="127" type="uint" />
     <field name="Sub-Pel Mode" start="140" end="141" type="uint" />
     <field name="Forward Transform Skip Check Enable" start="145" end="145" type="bool" />
+    <field name="Bme Disable For Fbr Message" start="146" end="146" type="bool" />
     <field name="Block-Based Skip Enable" start="147" end="147" type="bool" />
     <field name="Inter SAD Measure Adjustment" start="148" end="149" type="uint" prefix="ISMA">
       <value name="None" value="0" />
@@ -3916,8 +3940,8 @@
     <field name="Mode 9 Cost" start="360" end="367" type="uint" />
     <field name="RefID Cost" start="368" end="375" type="uint" />
     <field name="Chroma Intra Mode Cost" start="376" end="383" type="uint" />
-    <field name="MV Cost" start="384" end="447" type="uint" />
-    <field name="QpPrimeY" start="448" end="455" type="uint" />
+    <field name="MV Cost" start="384" end="447" type="IMAGE_STATE_COST" />
+    <field name="QpPrimeY" start="448" end="455" type="int" />
     <field name="TargetSizeInWord" start="472" end="479" type="uint" />
     <field name="AVC Intra 4x4 Mode Mask" start="544" end="552" type="uint" />
     <field name="AVC Intra 8x8 Mode Mask" start="560" end="568" type="uint" />
@@ -3943,7 +3967,7 @@
     <field name="HME Ref Windows Combining Threshold" start="840" end="847" type="uint" />
     <field name="Max Horizontal MV Range" start="864" end="879" type="uint" />
     <field name="Max Vertical MV Range" start="880" end="895" type="uint" />
-    <field name="HME MV Cost" start="896" end="959" type="uint" />
+    <field name="HME MV Cost" start="896" end="959" type="IMAGE_STATE_COST" />
     <field name="ROI QP Adjustment for Zone0" start="960" end="963" type="int" />
     <field name="ROI QP Adjustment for Zone1" start="964" end="967" type="int" />
     <field name="ROI QP Adjustment for Zone2" start="968" end="971" type="int" />
@@ -3958,8 +3982,8 @@
     <field name="Sad/Haar Threshold 0" start="1008" end="1023" type="uint" />
     <field name="Sad/Haar Threshold 1" start="1024" end="1039" type="uint" />
     <field name="Sad/Haar Threshold 2" start="1040" end="1055" type="uint" />
-    <field name="Min QP" start="1056" end="1063" type="uint" />
-    <field name="Max QP" start="1064" end="1071" type="uint" />
+    <field name="Max QP" start="1056" end="1063" type="uint" />
+    <field name="Min QP" start="1064" end="1071" type="uint" />
     <field name="Max Delta QP" start="1080" end="1083" type="uint" />
     <field name="ROI Enable" start="1088" end="1088" type="bool" />
     <field name="Fwd/Predictor0 MV Enable" start="1089" end="1089" type="bool" />
@@ -4012,6 +4036,7 @@
       <value name="4:4:4" value="3" />
     </field>
     <field name="Output Range Control After Color Space Conversion" start="49" end="49" type="bool" />
+    <field name="Disable Speed Mode Fetch Optimization" start="63" end="63" type="bool" />
   </instruction>
   <instruction name="VDENC_REF_SURFACE_STATE" bias="2" length="6" engine="video">
     <field name="DWord Length" start="0" end="11" type="uint" default="4" />
@@ -4031,8 +4056,8 @@
     <field name="Command Type" start="29" end="31" type="uint" default="3" />
     <field name="Surface State" start="64" end="191" type="VDENC_SURFACE_STATE_FIELDS" />
   </instruction>
-  <instruction name="VDENC_WALKER_STATE" bias="2" length="2" engine="video">
-    <field name="DWord Length" start="0" end="11" type="uint" default="0" />
+  <instruction name="VDENC_WALKER_STATE" bias="2" length="4" engine="video">
+    <field name="DWord Length" start="0" end="11" type="uint" default="2" />
     <field name="SubOpcode B" start="16" end="20" type="uint" default="7" />
     <field name="SubOpcode A" start="21" end="22" type="uint" default="0" />
     <field name="Media Command Opcode" start="23" end="26" type="uint" default="1" />
@@ -4041,14 +4066,25 @@
     <field name="MB/LCU Start Y Position" start="32" end="40" type="uint" />
     <field name="MB/LCU Start X Position" start="48" end="56" type="uint" />
     <field name="First Super Slice" start="60" end="60" type="bool" />
-    <field name="Tile Stream-In Offset Enable" start="192" end="192" type="bool" />
-    <field name="Tile Stream-In Offset" start="198" end="223" type="uint" />
-    <field name="Tile Row Store Offset Enable" start="224" end="224" type="bool" />
-    <field name="Tile Row Store Offset" start="230" end="255" type="uint" />
-    <field name="Tile Stream-Out Offset Enable" start="256" end="256" type="bool" />
-    <field name="Tile Stream-Out Offset" start="262" end="287" type="uint" />
-    <field name="Tile LCU Stream-Out Offset Enable" start="288" end="288" type="bool" />
-    <field name="Tile LCU Stream-Out Offset" start="294" end="319" type="uint" />
+    <field name="Next Slice MB Start Y Position" start="64" end="73" type="uint" />
+    <field name="Next Slice MB/LCU Start X Position" start="80" end="89" type="uint" />
+    <field name="Log2 Weight Denominator Luma" start="96" end="98" type="uint" />
+  </instruction>
+  <instruction name="VDENC_WEIGHTSOFFSETS_STATE" bias="2" length="3" engine="video">
+    <field name="DWord Length" start="0" end="11" type="uint" default="1" />
+    <field name="SubOpcode B" start="16" end="20" type="uint" default="8" />
+    <field name="SubOpcode A" start="21" end="22" type="uint" default="0" />
+    <field name="Media Command OpCode" start="23" end="26" type="uint" default="1" />
+    <field name="Pipeline" start="27" end="28" type="uint" default="2" />
+    <field name="Command Type" start="29" end="31" type="uint" default="3" />
+    <field name="Weights Forward Reference 0" start="32" end="39" type="int" />
+    <field name="Offset Forward Reference 0" start="40" end="47" type="int" />
+    <field name="Weights Forward Reference 1" start="48" end="55" type="int" />
+    <field name="Offset Forward Reference 1" start="56" end="63" type="int" />
+    <field name="Weights Forward Reference 2" start="64" end="71" type="int" />
+    <field name="Offset Forward Reference 2" start="72" end="79" type="int" />
+    <field name="HEVC/VP9 Weights Backward Reference 0" start="80" end="87" type="int" />
+    <field name="HEVC/VP9 Offset Backward Reference 0" start="88" end="95" type="int" />
   </instruction>
   <instruction name="VD_PIPELINE_FLUSH" bias="2" length="2" engine="video">
     <field name="DWord Length" start="0" end="11" type="uint" default="0" />