[PATCH] D98379: [RISCV] Add additional checking to tablgen RISCVVEmitter requested in D95016.

[Craig Topper via Phabricator via cfe-commits]

This revision was landed with ongoing or failed builds.
This revision was automatically updated to reflect the committed changes.
Closed by commit rG9773cad51939: [RISCV] Add additional checking to tablgen 
RISCVVEmitter requested in D95016. (authored by craig.topper).

Changed prior to commit:
  https://reviews.llvm.org/D98379?vs=329807&id=329831#toc

Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D98379/new/

https://reviews.llvm.org/D98379

Files:
  clang/utils/TableGen/RISCVVEmitter.cpp


Index: clang/utils/TableGen/RISCVVEmitter.cpp
===================================================================
--- clang/utils/TableGen/RISCVVEmitter.cpp
+++ clang/utils/TableGen/RISCVVEmitter.cpp
@@ -19,6 +19,7 @@
 #include "llvm/ADT/StringMap.h"
 #include "llvm/ADT/StringSet.h"
 #include "llvm/ADT/Twine.h"
+#include "llvm/TableGen/Error.h"
 #include "llvm/TableGen/Record.h"
 #include <numeric>
 
@@ -536,7 +537,7 @@
     ScalarType = ScalarTypeKind::Float;
     break;
   default:
-    llvm_unreachable("Unhandled type code!");
+    PrintFatalError("Unhandled type code!");
   }
   assert(ElementBitwidth != 0 && "Bad element bitwidth!");
 }
@@ -587,7 +588,7 @@
     Scale = 0;
     break;
   default:
-    llvm_unreachable("Illegal primitive type transformers!");
+    PrintFatalError("Illegal primitive type transformers!");
   }
   Transformer = Transformer.drop_back();
 
@@ -595,9 +596,15 @@
   for (char I : Transformer) {
     switch (I) {
     case 'P':
+      if (IsConstant)
+        PrintFatalError("'P' transformer cannot be used after 'C'");
+      if (IsPointer)
+        PrintFatalError("'P' transformer cannot be used twice");
       IsPointer = true;
       break;
     case 'C':
+      if (IsConstant)
+        PrintFatalError("'C' transformer cannot be used twice");
       IsConstant = true;
       break;
     case 'K':
@@ -614,11 +621,11 @@
       break;
     case 'S':
       LMUL = LMULType(0);
-      // Update ElementBitwidth need ot update Scale too.
+      // Update ElementBitwidth need to update Scale too.
       Scale = LMUL.getScale(ElementBitwidth);
       break;
     default:
-      llvm_unreachable("Illegal non-primitive type transformer!");
+      PrintFatalError("Illegal non-primitive type transformer!");
     }
   }
 }



Index: clang/utils/TableGen/RISCVVEmitter.cpp
===================================================================
--- clang/utils/TableGen/RISCVVEmitter.cpp
+++ clang/utils/TableGen/RISCVVEmitter.cpp
@@ -19,6 +19,7 @@
 #include "llvm/ADT/StringMap.h"
 #include "llvm/ADT/StringSet.h"
 #include "llvm/ADT/Twine.h"
+#include "llvm/TableGen/Error.h"
 #include "llvm/TableGen/Record.h"
 #include <numeric>
 
@@ -536,7 +537,7 @@
     ScalarType = ScalarTypeKind::Float;
     break;
   default:
-    llvm_unreachable("Unhandled type code!");
+    PrintFatalError("Unhandled type code!");
   }
   assert(ElementBitwidth != 0 && "Bad element bitwidth!");
 }
@@ -587,7 +588,7 @@
     Scale = 0;
     break;
   default:
-    llvm_unreachable("Illegal primitive type transformers!");
+    PrintFatalError("Illegal primitive type transformers!");
   }
   Transformer = Transformer.drop_back();
 
@@ -595,9 +596,15 @@
   for (char I : Transformer) {
     switch (I) {
     case 'P':
+      if (IsConstant)
+        PrintFatalError("'P' transformer cannot be used after 'C'");
+      if (IsPointer)
+        PrintFatalError("'P' transformer cannot be used twice");
       IsPointer = true;
       break;
     case 'C':
+      if (IsConstant)
+        PrintFatalError("'C' transformer cannot be used twice");
       IsConstant = true;
       break;
     case 'K':
@@ -614,11 +621,11 @@
       break;
     case 'S':
       LMUL = LMULType(0);
-      // Update ElementBitwidth need ot update Scale too.
+      // Update ElementBitwidth need to update Scale too.
       Scale = LMUL.getScale(ElementBitwidth);
       break;
     default:
-      llvm_unreachable("Illegal non-primitive type transformer!");
+      PrintFatalError("Illegal non-primitive type transformer!");
     }
   }
 }

_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits