treewide: Obliterate graph regions.

trailofbits · Sep 20, 2024 · 2073ac1 · 2073ac1
1 parent d015f04
commit 2073ac1
Show file tree

Hide file tree

Showing 16 changed files with 16 additions and 63 deletions.
diff --git a/include/vast/Dialect/ABI/ABI.td b/include/vast/Dialect/ABI/ABI.td
@@ -8,7 +8,6 @@ include "mlir/IR/OpAsmInterface.td"
 include "mlir/IR/SymbolInterfaces.td"
 include "mlir/Interfaces/SideEffectInterfaces.td"
 include "mlir/Interfaces/InferTypeOpInterface.td"
-include "mlir/IR/RegionKindInterface.td"
 
 include "vast/Dialect/Core/Interfaces/SymbolInterface.td"
 

diff --git a/include/vast/Dialect/Builtin/Builtin.td b/include/vast/Dialect/Builtin/Builtin.td
@@ -8,7 +8,6 @@ include "mlir/IR/OpAsmInterface.td"
 include "mlir/IR/SymbolInterfaces.td"
 include "mlir/Interfaces/SideEffectInterfaces.td"
 include "mlir/Interfaces/InferTypeOpInterface.td"
-include "mlir/IR/RegionKindInterface.td"
 include "mlir/IR/BuiltinAttributeInterfaces.td"
 
 def HLBuiltin_Dialect : Dialect {

diff --git a/include/vast/Dialect/Core/CoreOps.td b/include/vast/Dialect/Core/CoreOps.td
@@ -7,7 +7,6 @@ include "mlir/IR/OpBase.td"
 
 include "mlir/Dialect/DLTI/DLTIBase.td"
 include "mlir/Interfaces/DataLayoutInterfaces.td"
-include "mlir/IR/RegionKindInterface.td"
 
 include "vast/Dialect/Core/CoreTraits.td"
 include "vast/Dialect/Core/Interfaces/SymbolTableInterface.td"
@@ -77,8 +76,7 @@ def Core_ScopeOp : Core_Op< "scope", [
   NoTerminator, Core_ScopeLikeTrait,
   Core_ShadowingSymbolTable< [
     [Core_VarSymbol, Core_TypeSymbol], [Core_ElaboratedTypeSymbol]
-  ] >,
-  DeclareOpInterfaceMethods<RegionKindInterface>
+  ] >
 ] > {
   let summary = "VAST scope declaration";
   let description = [{

diff --git a/include/vast/Dialect/Core/Func.td b/include/vast/Dialect/Core/Func.td
@@ -4,7 +4,6 @@
 #define VAST_DIALECT_CORE_FUNC
 
 include "mlir/IR/OpBase.td"
-include "mlir/IR/RegionKindInterface.td"
 
 include "mlir/Interfaces/CallInterfaces.td"
 include "mlir/Interfaces/FunctionInterfaces.td"
@@ -38,8 +37,7 @@ class Core_FuncBaseOp< Dialect dialect, string mnemonic, list< Trait > traits =
       FunctionOpInterface,
       IsolatedFromAbove,
       Core_FuncSymbol,
-      NoTerminator,
-      DeclareOpInterfaceMethods< RegionKindInterface >
+      NoTerminator
     ])
 > {
   let summary = "VAST function template";

diff --git a/include/vast/Dialect/HighLevel/HighLevel.td b/include/vast/Dialect/HighLevel/HighLevel.td
@@ -8,7 +8,6 @@ include "mlir/IR/OpAsmInterface.td"
 include "mlir/IR/SymbolInterfaces.td"
 include "mlir/Interfaces/SideEffectInterfaces.td"
 include "mlir/Interfaces/InferTypeOpInterface.td"
-include "mlir/IR/RegionKindInterface.td"
 include "mlir/IR/BuiltinAttributeInterfaces.td"
 
 include "vast/Dialect/Core/Interfaces/SymbolInterface.td"

diff --git a/include/vast/Dialect/HighLevel/HighLevelCF.td b/include/vast/Dialect/HighLevel/HighLevelCF.td
@@ -10,7 +10,7 @@ include "vast/Dialect/Core/Interfaces/SymbolInterface.td"
 
 class HighLevel_ControlFlowOp< string mnemonic, list< Trait > traits = [] >
     : HighLevel_Op< mnemonic, !listconcat(traits,
-        [NoTerminator, NoRegionArguments, DeclareOpInterfaceMethods<RegionKindInterface>]
+        [NoTerminator, NoRegionArguments]
       ) >
 {
     let summary = "VAST control flow operation";
@@ -254,7 +254,7 @@ def HighLevel_ChooseExprOp : HighLevel_ControlFlowOp< "choose_expr" >
 def HighLevel_BinaryCondOp
   : HighLevel_Op<
         "binary_cond",
-        [NoTerminator, DeclareOpInterfaceMethods<RegionKindInterface>]
+        [NoTerminator]
     >
     , Results<(outs AnyType:$result)>
 {

diff --git a/include/vast/Dialect/HighLevel/HighLevelOps.td b/include/vast/Dialect/HighLevel/HighLevelOps.td
@@ -1472,7 +1472,7 @@ def HighLevel_OffsetOfExprOp
 }
 
 def HighLevel_StmtExprOp
-  : HighLevel_Op< "stmt.expr", [SingleBlock, DeclareOpInterfaceMethods<RegionKindInterface>] >
+  : HighLevel_Op< "stmt.expr", [SingleBlock] >
   , Results<(outs AnyType:$result)>
 {
   let summary = "VAST statement expression";

diff --git a/include/vast/Dialect/LowLevel/LowLevel.td b/include/vast/Dialect/LowLevel/LowLevel.td
@@ -8,7 +8,6 @@ include "mlir/IR/OpAsmInterface.td"
 include "mlir/IR/SymbolInterfaces.td"
 include "mlir/Interfaces/SideEffectInterfaces.td"
 include "mlir/Interfaces/InferTypeOpInterface.td"
-include "mlir/IR/RegionKindInterface.td"
 
 include "vast/Dialect/Core/Interfaces/SymbolInterface.td"
 

diff --git a/include/vast/Dialect/Meta/Meta.td b/include/vast/Dialect/Meta/Meta.td
@@ -8,7 +8,6 @@ include "mlir/IR/OpAsmInterface.td"
 include "mlir/IR/SymbolInterfaces.td"
 include "mlir/Interfaces/SideEffectInterfaces.td"
 include "mlir/Interfaces/InferTypeOpInterface.td"
-include "mlir/IR/RegionKindInterface.td"
 
 include "vast/Dialect/Core/Interfaces/SymbolInterface.td"
 

diff --git a/include/vast/Util/Dialect.hpp b/include/vast/Util/Dialect.hpp
diff --git a/lib/vast/Dialect/ABI/ABIOps.cpp b/lib/vast/Dialect/ABI/ABIOps.cpp
@@ -11,8 +11,6 @@ VAST_RELAX_WARNINGS
 #include <mlir/IR/Builders.h>
 VAST_UNRELAX_WARNINGS
 
-#include "vast/Util/Dialect.hpp"
-
 #include "vast/Dialect/Core/Func.hpp"
 
 namespace vast::abi
@@ -112,8 +110,6 @@ namespace vast::abi
         setOperand(0, callee.get< mlir_value >());
     }
 
-    SSACFG_REGION_OP( FuncOp );
-
     logical_result FuncOp::verify() {
         return core::verifyFuncOp(*this);
     }

diff --git a/lib/vast/Dialect/Core/CoreOps.cpp b/lib/vast/Dialect/Core/CoreOps.cpp
@@ -6,7 +6,6 @@
 #include "vast/Dialect/Core/CoreAttributes.hpp"
 
 #include "vast/Util/Common.hpp"
-#include "vast/Util/Dialect.hpp"
 
 #include <mlir/Support/LLVM.h>
 #include <mlir/Support/LogicalResult.h>
@@ -25,8 +24,6 @@
 
 namespace vast::core
 {
-    GRAPH_REGION_OP(ScopeOp);
-
     //
     // ModuleOp
     //

diff --git a/lib/vast/Dialect/Core/Func.cpp b/lib/vast/Dialect/Core/Func.cpp
@@ -18,7 +18,6 @@ VAST_UNRELAX_WARNINGS
 #include "vast/Dialect/Core/Linkage.hpp"
 
 #include "vast/Util/Common.hpp"
-#include "vast/Util/Dialect.hpp"
 #include "vast/Util/Region.hpp"
 
 namespace vast::core

diff --git a/lib/vast/Dialect/HighLevel/HighLevelOps.cpp b/lib/vast/Dialect/HighLevel/HighLevelOps.cpp
@@ -33,7 +33,6 @@ VAST_UNRELAX_WARNINGS
 #include "vast/Dialect/Core/SymbolTable.hpp"
 
 #include "vast/Util/Common.hpp"
-#include "vast/Util/Dialect.hpp"
 #include "vast/Util/Region.hpp"
 #include "vast/Util/TypeUtils.hpp"
 #include "vast/Util/Enum.hpp"
@@ -846,23 +845,6 @@ namespace vast::hl
         st.addTypes(type);
     }
 
-    GRAPH_REGION_OP(FuncOp);
-    GRAPH_REGION_OP(StmtExprOp);
-
-    GRAPH_REGION_OP(IfOp);
-    GRAPH_REGION_OP(WhileOp);
-    GRAPH_REGION_OP(ForOp);
-    GRAPH_REGION_OP(DoOp);
-    GRAPH_REGION_OP(SwitchOp);
-    GRAPH_REGION_OP(CaseOp);
-    GRAPH_REGION_OP(DefaultOp);
-    GRAPH_REGION_OP(LabelStmt);
-    GRAPH_REGION_OP(BreakOp);
-    GRAPH_REGION_OP(CondOp);
-    GRAPH_REGION_OP(ChooseExprOp);
-    GRAPH_REGION_OP(BinaryCondOp);
-    GRAPH_REGION_OP(ContinueOp);
-
     std::size_t handle_size_of(auto op, mlir_type type) {
         auto eval = [op] (mlir_type ty) -> std::size_t {
             // sizeof(void), sizeof(function) = 1 as a gcc extension

diff --git a/lib/vast/Dialect/LowLevel/LowLevelOps.cpp b/lib/vast/Dialect/LowLevel/LowLevelOps.cpp
@@ -13,7 +13,6 @@ VAST_RELAX_WARNINGS
 #include <mlir/Interfaces/FunctionImplementation.h>
 VAST_UNRELAX_WARNINGS
 
-#include "vast/Util/Dialect.hpp"
 #include "vast/Util/Region.hpp"
 
 namespace vast::ll
@@ -49,8 +48,6 @@ namespace vast::ll
         return core::printFunctionSignatureAndBodyImpl(printer, op, function_type, dict_attr, body);
     }
 
-    SSACFG_REGION_OP( FuncOp );
-
 } // namespace vast::ll
 
 #define GET_OP_CLASSES

diff --git a/test/vast/Dialect/HighLevel/vars-c.c b/test/vast/Dialect/HighLevel/vars-c.c
@@ -1,38 +1,38 @@
 // RUN: %vast-front -vast-emit-mlir=hl -o - %s | %file-check %s
-// REQUIRES: non-graph-regions
+// REQUIRES: loop-init-section
 
 #include <stdlib.h>
 
 int main() {
-    // CHECK: hl.var @y : !hl.lvalue<!hl.ptr<!hl.int>>
+    // CHECK: hl.var [[Y:@y]] : !hl.lvalue<!hl.ptr<!hl.int>>
     // CHECK: hl.sizeof.expr
     // CHECK: hl.ref [[Y]]
     int *y = malloc(sizeof(*y));
     if(1) {
-    // CHECK: hl.var @x : !hl.lvalue<!hl.ptr<!hl.int>>
+    // CHECK: hl.var [[X:@x]] : !hl.lvalue<!hl.ptr<!hl.int>>
     // CHECK: hl.sizeof.expr
     // CHECK: hl.ref [[X]]
         int *x = malloc(sizeof(*x));
     }
     while(1) {
-    // CHECK: hl.var @x : !hl.lvalue<!hl.ptr<!hl.int>>
+    // CHECK: hl.var [[X:@x]] : !hl.lvalue<!hl.ptr<!hl.int>>
     // CHECK: hl.sizeof.expr
     // CHECK: hl.ref [[X]]
         int *x = malloc(sizeof(*x));
     }
     do{
-    // CHECK: hl.var @x : !hl.lvalue<!hl.ptr<!hl.int>>
+    // CHECK: hl.var [[X:@x]] : !hl.lvalue<!hl.ptr<!hl.int>>
     // CHECK: hl.sizeof.expr
     // CHECK: hl.ref [[X]]
         int *x = malloc(sizeof(*x));
     }while(0);
     // CHECK: core.scope
-    // CHECK-NEXT: hl.var @x : !hl.lvalue<!hl.ptr<!hl.int>>
+    // CHECK-NEXT: hl.var [[X:@x]] : !hl.lvalue<!hl.ptr<!hl.int>>
     // CHECK: hl.sizeof.expr
     // CHECK: hl.ref [[X]]
     for(int *x = malloc(sizeof(*x)); *x<100; *x++) {
     // CHECK: do
-    // CHECK-NEXT: hl.var @f : !hl.lvalue<!hl.ptr<!hl.int>>
+    // CHECK-NEXT: hl.var [[F:@f]] : !hl.lvalue<!hl.ptr<!hl.int>>
     // CHECK: hl.sizeof.expr
     // CHECK: hl.ref [[F]]
         int *f = malloc(sizeof(*f));
@@ -43,7 +43,7 @@ int main() {
     if (*y) {
         case 2: case 3: case 5: case 7: {
     // CHECK: hl.case
-    // CHECK: hl.var @x : !hl.lvalue<!hl.ptr<!hl.int>>
+    // CHECK: hl.var [[X:@x]] : !hl.lvalue<!hl.ptr<!hl.int>>
     // CHECK: hl.sizeof.expr
     // CHECK: hl.ref [[X]]
             int *x = malloc(sizeof(*x));
@@ -57,13 +57,13 @@ int main() {
         case 1:
         default: {
     // CHECK: hl.default
-    // CHECK: hl.var @z : !hl.lvalue<!hl.ptr<!hl.int>>
+    // CHECK: hl.var [[Z:@z]] : !hl.lvalue<!hl.ptr<!hl.int>>
     // CHECK: hl.sizeof.expr
     // CHECK: hl.ref [[Z]]
             int *z = malloc(sizeof(*z));
         }
     }
-    // CHECK: hl.var @g : !hl.lvalue<!hl.ptr<!hl.int>>
+    // CHECK: hl.var [[G:@g]] : !hl.lvalue<!hl.ptr<!hl.int>>
     // CHECK: hl.cond
     // CHECK: ?
     // CHECK: hl.sizeof.expr
@@ -73,7 +73,7 @@ int main() {
     int *g = y ? malloc(sizeof(*g)) : y ;
     ({
     // CHECK: hl.stmt.expr
-    // CHECK: hl.var @z : !hl.lvalue<!hl.ptr<!hl.int>>
+    // CHECK: hl.var [[Z:@z]] : !hl.lvalue<!hl.ptr<!hl.int>>
     // CHECK: hl.sizeof.expr
     // CHECK: hl.ref [[Z]]
             int *z = malloc(sizeof(*z));