From: Zhao Yakui <yakui.z...@intel.com>

Signed-off-by: Zhao Yakui <yakui.z...@intel.com>
Signed-off-by: Ben Widawsky <benjamin.widaw...@intel.com>
Signed-off-by: Damien Lespiau <damien.lesp...@intel.com>
---
 assembler/gram.y | 40 ++++++++++++++++++++++++++++++----------
 1 file changed, 30 insertions(+), 10 deletions(-)

diff --git a/assembler/gram.y b/assembler/gram.y
index 157ce79..9689352 100644
--- a/assembler/gram.y
+++ b/assembler/gram.y
@@ -1671,11 +1671,21 @@ msgtarget:      NULL_TOKEN
                INTEGER RPAREN
                {
                  if (IS_GENp(8)) {
-                      if ($9 != 0 &&
-                         $9 != GEN6_SFID_DATAPORT_RENDER_CACHE &&
-                         $9 != GEN7_SFID_DATAPORT_DATA_CACHE &&
-                         $9 != HSW_SFID_DATAPORT_DATA_CACHE1) {
-                         error (&@9, "error: wrong cache type\n");
+                      if (IS_GENp(9)) {
+                          if ($9 != 0 &&
+                             $9 != GEN6_SFID_DATAPORT_RENDER_CACHE &&
+                             $9 != GEN7_SFID_DATAPORT_DATA_CACHE &&
+                             $9 != HSW_SFID_DATAPORT_DATA_CACHE1 &&
+                             $9 != SKL_SFID_DATAPORT_DATA_CACHE2) {
+                             error (&@9, "error: wrong cache type\n");
+                          }
+                      } else {
+                          if ($9 != 0 &&
+                             $9 != GEN6_SFID_DATAPORT_RENDER_CACHE &&
+                             $9 != GEN7_SFID_DATAPORT_DATA_CACHE &&
+                             $9 != HSW_SFID_DATAPORT_DATA_CACHE1) {
+                             error (&@9, "error: wrong cache type\n");
+                          }
                      }
 
                      if ($9 == 0)
@@ -1732,11 +1742,21 @@ msgtarget:      NULL_TOKEN
                INTEGER COMMA INTEGER RPAREN
                {
                  if (IS_GENp(8)) {
-                      if ($9 != 0 &&
-                         $9 != GEN6_SFID_DATAPORT_RENDER_CACHE &&
-                         $9 != GEN7_SFID_DATAPORT_DATA_CACHE &&
-                         $9 != HSW_SFID_DATAPORT_DATA_CACHE1) {
-                         error (&@9, "error: wrong cache type\n");
+                      if (IS_GENp(9)) {
+                          if ($9 != 0 &&
+                             $9 != GEN6_SFID_DATAPORT_RENDER_CACHE &&
+                             $9 != GEN7_SFID_DATAPORT_DATA_CACHE &&
+                             $9 != HSW_SFID_DATAPORT_DATA_CACHE1 &&
+                             $9 != SKL_SFID_DATAPORT_DATA_CACHE2) {
+                             error (&@9, "error: wrong cache type\n");
+                          }
+                      } else {
+                          if ($9 != 0 &&
+                             $9 != GEN6_SFID_DATAPORT_RENDER_CACHE &&
+                             $9 != GEN7_SFID_DATAPORT_DATA_CACHE &&
+                             $9 != HSW_SFID_DATAPORT_DATA_CACHE1) {
+                             error (&@9, "error: wrong cache type\n");
+                          }
                      }
 
                      if ($9 == 0)
-- 
1.8.3.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Reply via email to