diff --git a/test/query/simple.c b/test/query/simple.c
index c70cbef043..88965caf6e 100644
--- a/test/query/simple.c
+++ b/test/query/simple.c
@@ -1,4 +1,4 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-query --show-symbols=functions %t | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-query --show-symbols=functions %t | %file-check %s
 
 // CHECK: func : main
 int main() {}
diff --git a/test/query/symbols.c b/test/query/symbols.c
index aa406c0c36..969b80b793 100644
--- a/test/query/symbols.c
+++ b/test/query/symbols.c
@@ -1,20 +1,20 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && \
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && \
 // RUN: %vast-query --show-symbols=all %t | \
 // RUN: %file-check %s -check-prefix=FOO-VAR -check-prefix=MAIN-VAR -check-prefix=FUN
 
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && \
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && \
 // RUN: %vast-query --show-symbols=vars %t | \
 // RUN: %file-check %s -check-prefix=FOO-VAR -check-prefix=MAIN-VAR
 
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && \
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && \
 // RUN: %vast-query --show-symbols=vars %t --scope=foo | \
 // RUN: %file-check %s -check-prefix=FOO-VAR
 
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && \
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && \
 // RUN: %vast-query --show-symbols=vars %t --scope=main | \
 // RUN: %file-check %s -check-prefix=MAIN-VAR
 
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && \
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && \
 // RUN: %vast-query --show-symbols=functions %t | \
 // RUN: %file-check %s -check-prefix=FUN
 
diff --git a/test/query/users.c b/test/query/users.c
index cc2176ff6e..601ae24bda 100644
--- a/test/query/users.c
+++ b/test/query/users.c
@@ -1,12 +1,12 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && \
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && \
 // RUN: %vast-query --symbol-users=a %t | \
 // RUN: %file-check %s -check-prefix=MAIN -check-prefix=FOO
 
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && \
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && \
 // RUN: %vast-query --symbol-users=a --scope=main %t | \
 // RUN: %file-check %s -check-prefix=MAIN
 
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && \
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && \
 // RUN: %vast-query --symbol-users=a --scope=foo %t | \
 // RUN: %file-check %s -check-prefix=FOO
 
diff --git a/test/vast/Conversion/Common/CoreToLLVM/binland-a.c b/test/vast/Conversion/Common/CoreToLLVM/binland-a.c
index cb657bb21a..8e68a8e9c3 100644
--- a/test/vast/Conversion/Common/CoreToLLVM/binland-a.c
+++ b/test/vast/Conversion/Common/CoreToLLVM/binland-a.c
@@ -1,4 +1,4 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %vast-opt --vast-hl-lower-types --vast-hl-to-ll-cf --vast-hl-to-ll-vars --vast-hl-to-lazy-regions --vast-irs-to-llvm --vast-core-to-llvm | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %vast-opt --vast-hl-lower-types --vast-hl-to-ll-cf --vast-hl-to-ll-vars --vast-hl-to-lazy-regions --vast-irs-to-llvm --vast-core-to-llvm | %file-check %s
 
 int fun(int arg1, int arg2) {
     int res = arg1 && arg2;
diff --git a/test/vast/Conversion/Common/CoreToLLVM/binlor-a.c b/test/vast/Conversion/Common/CoreToLLVM/binlor-a.c
index 5ad6b730cc..5afad7e8b3 100644
--- a/test/vast/Conversion/Common/CoreToLLVM/binlor-a.c
+++ b/test/vast/Conversion/Common/CoreToLLVM/binlor-a.c
@@ -1,4 +1,4 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %vast-opt --vast-hl-lower-types --vast-hl-to-ll-cf --vast-hl-to-ll-vars --vast-hl-to-lazy-regions --vast-irs-to-llvm --vast-core-to-llvm | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %vast-opt --vast-hl-lower-types --vast-hl-to-ll-cf --vast-hl-to-ll-vars --vast-hl-to-lazy-regions --vast-irs-to-llvm --vast-core-to-llvm | %file-check %s
 
 int fun(int arg1, int arg2) {
     int res = arg1 || arg2;
diff --git a/test/vast/Conversion/Common/IRsToLLVM/add-a.c b/test/vast/Conversion/Common/IRsToLLVM/add-a.c
index 068eafe1d9..4dfa40b296 100644
--- a/test/vast/Conversion/Common/IRsToLLVM/add-a.c
+++ b/test/vast/Conversion/Common/IRsToLLVM/add-a.c
@@ -1,4 +1,4 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %vast-opt --vast-hl-lower-types --vast-hl-to-ll-cf --vast-hl-to-ll-vars --vast-irs-to-llvm | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %vast-opt --vast-hl-lower-types --vast-hl-to-ll-cf --vast-hl-to-ll-vars --vast-irs-to-llvm | %file-check %s
 
 // CHECK: llvm.func @fn(%arg0: i32, %arg1: i32) -> i32 {
 int fn(int arg0, int arg1)
diff --git a/test/vast/Conversion/Common/IRsToLLVM/addfloat-a.c b/test/vast/Conversion/Common/IRsToLLVM/addfloat-a.c
index 74aa976fa1..dcb2c6c62f 100644
--- a/test/vast/Conversion/Common/IRsToLLVM/addfloat-a.c
+++ b/test/vast/Conversion/Common/IRsToLLVM/addfloat-a.c
@@ -1,4 +1,4 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %vast-opt --vast-hl-lower-types --vast-hl-to-ll-cf --vast-hl-to-ll-vars --vast-irs-to-llvm | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %vast-opt --vast-hl-lower-types --vast-hl-to-ll-cf --vast-hl-to-ll-vars --vast-irs-to-llvm | %file-check %s
 
 // CHECK: llvm.func @fn(%arg0: f32, %arg1: f32) -> f32 {
 float fn(float arg0, float arg1)
diff --git a/test/vast/Conversion/Common/IRsToLLVM/array-a.c b/test/vast/Conversion/Common/IRsToLLVM/array-a.c
index bc3fa6ec76..d3dd210bd5 100644
--- a/test/vast/Conversion/Common/IRsToLLVM/array-a.c
+++ b/test/vast/Conversion/Common/IRsToLLVM/array-a.c
@@ -1,4 +1,4 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %vast-opt --vast-hl-lower-types --vast-hl-to-ll-cf --vast-hl-to-ll-vars --vast-irs-to-llvm | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %vast-opt --vast-hl-lower-types --vast-hl-to-ll-cf --vast-hl-to-ll-vars --vast-irs-to-llvm | %file-check %s
 
 void count()
 {
diff --git a/test/vast/Conversion/Common/IRsToLLVM/array-b.c b/test/vast/Conversion/Common/IRsToLLVM/array-b.c
index 0c683ef05f..dbe4c34e42 100644
--- a/test/vast/Conversion/Common/IRsToLLVM/array-b.c
+++ b/test/vast/Conversion/Common/IRsToLLVM/array-b.c
@@ -1,4 +1,4 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %vast-opt --vast-hl-lower-types --vast-hl-to-ll-cf --vast-hl-to-ll-vars --vast-irs-to-llvm | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %vast-opt --vast-hl-lower-types --vast-hl-to-ll-cf --vast-hl-to-ll-vars --vast-irs-to-llvm | %file-check %s
 
 void count()
 {
diff --git a/test/vast/Conversion/Common/IRsToLLVM/bin_not.c b/test/vast/Conversion/Common/IRsToLLVM/bin_not.c
index 4f812361ba..2a5cbfb951 100644
--- a/test/vast/Conversion/Common/IRsToLLVM/bin_not.c
+++ b/test/vast/Conversion/Common/IRsToLLVM/bin_not.c
@@ -1,4 +1,4 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %vast-opt --vast-hl-splice-trailing-scopes --vast-hl-lower-types --vast-hl-to-ll-cf --vast-hl-to-ll-vars --vast-irs-to-llvm | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %vast-opt --vast-hl-splice-trailing-scopes --vast-hl-lower-types --vast-hl-to-ll-cf --vast-hl-to-ll-vars --vast-irs-to-llvm | %file-check %s
 
 int main() {
     int a = 5;
diff --git a/test/vast/Conversion/Common/IRsToLLVM/divfloat-a.c b/test/vast/Conversion/Common/IRsToLLVM/divfloat-a.c
index 899ff08549..0523eef87f 100644
--- a/test/vast/Conversion/Common/IRsToLLVM/divfloat-a.c
+++ b/test/vast/Conversion/Common/IRsToLLVM/divfloat-a.c
@@ -1,4 +1,4 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %vast-opt --vast-hl-lower-types --vast-hl-to-ll-cf --vast-hl-to-ll-vars --vast-irs-to-llvm | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %vast-opt --vast-hl-lower-types --vast-hl-to-ll-cf --vast-hl-to-ll-vars --vast-irs-to-llvm | %file-check %s
 
 // CHECK: llvm.func @fn(%arg0: f32, %arg1: f32) -> f32 {
 float fn(float arg0, float arg1)
diff --git a/test/vast/Conversion/Common/IRsToLLVM/divsigned-a.c b/test/vast/Conversion/Common/IRsToLLVM/divsigned-a.c
index f6b221291b..9c88cc0793 100644
--- a/test/vast/Conversion/Common/IRsToLLVM/divsigned-a.c
+++ b/test/vast/Conversion/Common/IRsToLLVM/divsigned-a.c
@@ -1,4 +1,4 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %vast-opt --vast-hl-lower-types --vast-hl-to-ll-cf --vast-hl-to-ll-vars --vast-irs-to-llvm | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %vast-opt --vast-hl-lower-types --vast-hl-to-ll-cf --vast-hl-to-ll-vars --vast-irs-to-llvm | %file-check %s
 
 // CHECK: llvm.func @fn(%arg0: i32, %arg1: i32) -> i32 {
 int fn(int arg0, int arg1)
diff --git a/test/vast/Conversion/Common/IRsToLLVM/divunsigned-a.c b/test/vast/Conversion/Common/IRsToLLVM/divunsigned-a.c
index 3504b85caa..732e0b8dc8 100644
--- a/test/vast/Conversion/Common/IRsToLLVM/divunsigned-a.c
+++ b/test/vast/Conversion/Common/IRsToLLVM/divunsigned-a.c
@@ -1,4 +1,4 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %vast-opt --vast-hl-lower-types --vast-hl-to-ll-cf --vast-hl-to-ll-vars --vast-irs-to-llvm | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %vast-opt --vast-hl-lower-types --vast-hl-to-ll-cf --vast-hl-to-ll-vars --vast-irs-to-llvm | %file-check %s
 
 // CHECK: llvm.func @fn(%arg0: i32, %arg1: i32) -> i32 {
 unsigned int fn(unsigned int arg0, unsigned int arg1)
diff --git a/test/vast/Conversion/Common/IRsToLLVM/float-a.c b/test/vast/Conversion/Common/IRsToLLVM/float-a.c
index 471c6ac61e..7fd9fa8565 100644
--- a/test/vast/Conversion/Common/IRsToLLVM/float-a.c
+++ b/test/vast/Conversion/Common/IRsToLLVM/float-a.c
@@ -1,4 +1,4 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %vast-opt --vast-hl-lower-types --vast-hl-to-ll-cf --vast-hl-to-ll-vars --vast-irs-to-llvm | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %vast-opt --vast-hl-lower-types --vast-hl-to-ll-cf --vast-hl-to-ll-vars --vast-irs-to-llvm | %file-check %s
 
 void count()
 {
diff --git a/test/vast/Conversion/Common/IRsToLLVM/fn-a.c b/test/vast/Conversion/Common/IRsToLLVM/fn-a.c
index ef0debeec6..573a11a361 100644
--- a/test/vast/Conversion/Common/IRsToLLVM/fn-a.c
+++ b/test/vast/Conversion/Common/IRsToLLVM/fn-a.c
@@ -1,4 +1,4 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %vast-opt --vast-hl-lower-types --vast-hl-to-ll-cf --vast-hl-to-ll-vars --vast-irs-to-llvm | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %vast-opt --vast-hl-lower-types --vast-hl-to-ll-cf --vast-hl-to-ll-vars --vast-irs-to-llvm | %file-check %s
 
 // CHECK: llvm.func @fn() {
 void fn()
diff --git a/test/vast/Conversion/Common/IRsToLLVM/fn-b.c b/test/vast/Conversion/Common/IRsToLLVM/fn-b.c
index ffe28ca766..b1ebdd9490 100644
--- a/test/vast/Conversion/Common/IRsToLLVM/fn-b.c
+++ b/test/vast/Conversion/Common/IRsToLLVM/fn-b.c
@@ -1,4 +1,4 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %vast-opt --vast-hl-lower-types --vast-hl-to-ll-cf --vast-hl-to-ll-vars --vast-irs-to-llvm | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %vast-opt --vast-hl-lower-types --vast-hl-to-ll-cf --vast-hl-to-ll-vars --vast-irs-to-llvm | %file-check %s
 
 // CHECK: llvm.func @fn() -> i32 {
 int fn()
diff --git a/test/vast/Conversion/Common/IRsToLLVM/hl-assign-a.c b/test/vast/Conversion/Common/IRsToLLVM/hl-assign-a.c
index 67ea283bf5..fc34ed2136 100644
--- a/test/vast/Conversion/Common/IRsToLLVM/hl-assign-a.c
+++ b/test/vast/Conversion/Common/IRsToLLVM/hl-assign-a.c
@@ -1,4 +1,4 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %vast-opt --vast-hl-lower-types --vast-hl-to-ll-cf --vast-hl-to-ll-vars --vast-irs-to-llvm | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %vast-opt --vast-hl-lower-types --vast-hl-to-ll-cf --vast-hl-to-ll-vars --vast-irs-to-llvm | %file-check %s
 
 // CHECK: llvm.func @count([[ARG:%arg[0-9]+]]: i32)
 void count(int arg)
diff --git a/test/vast/Conversion/Common/IRsToLLVM/hl-assign-b.c b/test/vast/Conversion/Common/IRsToLLVM/hl-assign-b.c
index f4e51999f7..939a7124ef 100644
--- a/test/vast/Conversion/Common/IRsToLLVM/hl-assign-b.c
+++ b/test/vast/Conversion/Common/IRsToLLVM/hl-assign-b.c
@@ -1,4 +1,4 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %vast-opt --vast-hl-lower-types --vast-hl-to-ll-cf --vast-hl-to-ll-vars --vast-irs-to-llvm | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %vast-opt --vast-hl-lower-types --vast-hl-to-ll-cf --vast-hl-to-ll-vars --vast-irs-to-llvm | %file-check %s
 
 // CHECK: llvm.func @count([[ARG:%arg[0-9]+]]: i32)
 void count(int arg)
diff --git a/test/vast/Conversion/Common/IRsToLLVM/hl-assign-c.c b/test/vast/Conversion/Common/IRsToLLVM/hl-assign-c.c
index 5d9152e376..3d0d5063aa 100644
--- a/test/vast/Conversion/Common/IRsToLLVM/hl-assign-c.c
+++ b/test/vast/Conversion/Common/IRsToLLVM/hl-assign-c.c
@@ -1,4 +1,4 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %vast-opt --vast-hl-lower-types --vast-hl-to-ll-cf --vast-hl-to-ll-vars --vast-irs-to-llvm | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %vast-opt --vast-hl-lower-types --vast-hl-to-ll-cf --vast-hl-to-ll-vars --vast-irs-to-llvm | %file-check %s
 
 void count()
 {
diff --git a/test/vast/Conversion/Common/IRsToLLVM/mul-a.c b/test/vast/Conversion/Common/IRsToLLVM/mul-a.c
index 7f93c6a1ac..f02e2636cd 100644
--- a/test/vast/Conversion/Common/IRsToLLVM/mul-a.c
+++ b/test/vast/Conversion/Common/IRsToLLVM/mul-a.c
@@ -1,4 +1,4 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %vast-opt --vast-hl-lower-types --vast-hl-to-ll-cf --vast-hl-to-ll-vars --vast-irs-to-llvm | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %vast-opt --vast-hl-lower-types --vast-hl-to-ll-cf --vast-hl-to-ll-vars --vast-irs-to-llvm | %file-check %s
 
 // CHECK: llvm.func @fn(%arg0: i32, %arg1: i32) -> i32 {
 int fn(int arg0, int arg1)
diff --git a/test/vast/Conversion/Common/IRsToLLVM/mulfloat-a.c b/test/vast/Conversion/Common/IRsToLLVM/mulfloat-a.c
index 962194d3ea..e48b9e6c92 100644
--- a/test/vast/Conversion/Common/IRsToLLVM/mulfloat-a.c
+++ b/test/vast/Conversion/Common/IRsToLLVM/mulfloat-a.c
@@ -1,4 +1,4 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %vast-opt --vast-hl-lower-types --vast-hl-to-ll-cf --vast-hl-to-ll-vars --vast-irs-to-llvm | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %vast-opt --vast-hl-lower-types --vast-hl-to-ll-cf --vast-hl-to-ll-vars --vast-irs-to-llvm | %file-check %s
 
 // CHECK: llvm.func @fn(%arg0: f32, %arg1: f32) -> f32 {
 float fn(float arg0, float arg1)
diff --git a/test/vast/Conversion/Common/IRsToLLVM/not-float.c b/test/vast/Conversion/Common/IRsToLLVM/not-float.c
index 8f1f895071..eae5aa0ea5 100644
--- a/test/vast/Conversion/Common/IRsToLLVM/not-float.c
+++ b/test/vast/Conversion/Common/IRsToLLVM/not-float.c
@@ -1,4 +1,4 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %vast-opt --vast-hl-lower-types --vast-hl-to-ll-cf --vast-hl-to-ll-vars --vast-irs-to-llvm | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %vast-opt --vast-hl-lower-types --vast-hl-to-ll-cf --vast-hl-to-ll-vars --vast-irs-to-llvm | %file-check %s
 
 int main() {
     float a = 5;
diff --git a/test/vast/Conversion/Common/IRsToLLVM/not.c b/test/vast/Conversion/Common/IRsToLLVM/not.c
index e2f841a989..1d905c44a7 100644
--- a/test/vast/Conversion/Common/IRsToLLVM/not.c
+++ b/test/vast/Conversion/Common/IRsToLLVM/not.c
@@ -1,4 +1,4 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %vast-opt --vast-hl-lower-types --vast-hl-to-ll-cf --vast-hl-to-ll-vars --vast-irs-to-llvm | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %vast-opt --vast-hl-lower-types --vast-hl-to-ll-cf --vast-hl-to-ll-vars --vast-irs-to-llvm | %file-check %s
 
 int main() {
     int a = 5;
diff --git a/test/vast/Conversion/Common/IRsToLLVM/remsigned-a.c b/test/vast/Conversion/Common/IRsToLLVM/remsigned-a.c
index 81b7c669bb..81d63c586d 100644
--- a/test/vast/Conversion/Common/IRsToLLVM/remsigned-a.c
+++ b/test/vast/Conversion/Common/IRsToLLVM/remsigned-a.c
@@ -1,4 +1,4 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %vast-opt --vast-hl-lower-types --vast-hl-to-ll-cf --vast-hl-to-ll-vars --vast-irs-to-llvm | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %vast-opt --vast-hl-lower-types --vast-hl-to-ll-cf --vast-hl-to-ll-vars --vast-irs-to-llvm | %file-check %s
 
 // CHECK: llvm.func @fn(%arg0: i32, %arg1: i32) -> i32 {
 int fn(int arg0, int arg1)
diff --git a/test/vast/Conversion/Common/IRsToLLVM/remunsigned-a.c b/test/vast/Conversion/Common/IRsToLLVM/remunsigned-a.c
index d2140236b4..5e94830375 100644
--- a/test/vast/Conversion/Common/IRsToLLVM/remunsigned-a.c
+++ b/test/vast/Conversion/Common/IRsToLLVM/remunsigned-a.c
@@ -1,4 +1,4 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %vast-opt --vast-hl-lower-types --vast-hl-to-ll-cf --vast-hl-to-ll-vars --vast-irs-to-llvm | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %vast-opt --vast-hl-lower-types --vast-hl-to-ll-cf --vast-hl-to-ll-vars --vast-irs-to-llvm | %file-check %s
 
 // CHECK: llvm.func @fn(%arg0: i32, %arg1: i32) -> i32 {
 unsigned int fn(unsigned int arg0, unsigned int arg1)
diff --git a/test/vast/Conversion/Common/IRsToLLVM/sizeof-a.c b/test/vast/Conversion/Common/IRsToLLVM/sizeof-a.c
index 71f20acc32..d3dccc2dd2 100644
--- a/test/vast/Conversion/Common/IRsToLLVM/sizeof-a.c
+++ b/test/vast/Conversion/Common/IRsToLLVM/sizeof-a.c
@@ -1,4 +1,4 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %vast-opt --vast-hl-lower-types --vast-hl-to-ll-cf --vast-hl-to-ll-vars --vast-irs-to-llvm | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %vast-opt --vast-hl-lower-types --vast-hl-to-ll-cf --vast-hl-to-ll-vars --vast-irs-to-llvm | %file-check %s
 
 unsigned long sizeof_int() {
     // CHECK: llvm.mlir.constant(4 : i64) : i64
diff --git a/test/vast/Conversion/Common/IRsToLLVM/sub-a.c b/test/vast/Conversion/Common/IRsToLLVM/sub-a.c
index aded84a5fa..8d94131f82 100644
--- a/test/vast/Conversion/Common/IRsToLLVM/sub-a.c
+++ b/test/vast/Conversion/Common/IRsToLLVM/sub-a.c
@@ -1,4 +1,4 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %vast-opt --vast-hl-lower-types --vast-hl-to-ll-cf --vast-hl-to-ll-vars --vast-irs-to-llvm | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %vast-opt --vast-hl-lower-types --vast-hl-to-ll-cf --vast-hl-to-ll-vars --vast-irs-to-llvm | %file-check %s
 
 // CHECK: llvm.func @fn(%arg0: i32, %arg1: i32) -> i32 {
 int fn(int arg0, int arg1)
diff --git a/test/vast/Conversion/Common/IRsToLLVM/subfloat-a.c b/test/vast/Conversion/Common/IRsToLLVM/subfloat-a.c
index c0b74dd160..8f38fb3de1 100644
--- a/test/vast/Conversion/Common/IRsToLLVM/subfloat-a.c
+++ b/test/vast/Conversion/Common/IRsToLLVM/subfloat-a.c
@@ -1,4 +1,4 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %vast-opt --vast-hl-lower-types --vast-hl-to-ll-cf --vast-hl-to-ll-vars --vast-irs-to-llvm | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %vast-opt --vast-hl-lower-types --vast-hl-to-ll-cf --vast-hl-to-ll-vars --vast-irs-to-llvm | %file-check %s
 
 // CHECK: llvm.func @fn(%arg0: f32, %arg1: f32) -> f32 {
 float fn(float arg0, float arg1)
diff --git a/test/vast/Conversion/FromHL/ToLLCF/for-a.c b/test/vast/Conversion/FromHL/ToLLCF/for-a.c
index 212ced654e..27f23443a1 100644
--- a/test/vast/Conversion/FromHL/ToLLCF/for-a.c
+++ b/test/vast/Conversion/FromHL/ToLLCF/for-a.c
@@ -1,4 +1,4 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %vast-opt --vast-hl-dce --vast-hl-lower-types --vast-hl-to-ll-cf | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %vast-opt --vast-hl-dce --vast-hl-lower-types --vast-hl-to-ll-cf | %file-check %s
 
 void fn()
 {
diff --git a/test/vast/Conversion/FromHL/ToLLCF/for-b.c b/test/vast/Conversion/FromHL/ToLLCF/for-b.c
index 7495b3a567..1b02c56396 100644
--- a/test/vast/Conversion/FromHL/ToLLCF/for-b.c
+++ b/test/vast/Conversion/FromHL/ToLLCF/for-b.c
@@ -1,4 +1,4 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %vast-opt --vast-hl-dce --vast-hl-lower-types --vast-hl-to-ll-cf | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %vast-opt --vast-hl-dce --vast-hl-lower-types --vast-hl-to-ll-cf | %file-check %s
 
 int fn()
 {
diff --git a/test/vast/Conversion/FromHL/ToLLVars/vars-a.c b/test/vast/Conversion/FromHL/ToLLVars/vars-a.c
index f8a68b375b..f65c8babb9 100644
--- a/test/vast/Conversion/FromHL/ToLLVars/vars-a.c
+++ b/test/vast/Conversion/FromHL/ToLLVars/vars-a.c
@@ -1,4 +1,4 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %vast-opt --vast-hl-dce --vast-hl-lower-types --vast-hl-to-ll-vars | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %vast-opt --vast-hl-dce --vast-hl-lower-types --vast-hl-to-ll-vars | %file-check %s
 
 int main()
 {
diff --git a/test/vast/Dialect/Core/binlop-a.c b/test/vast/Dialect/Core/binlop-a.c
index c0171a6dd3..1014a556ef 100644
--- a/test/vast/Dialect/Core/binlop-a.c
+++ b/test/vast/Dialect/Core/binlop-a.c
@@ -1,4 +1,4 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %vast-opt --vast-hl-to-lazy-regions | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %vast-opt --vast-hl-to-lazy-regions | %file-check %s
 
 void logic_assign_to_different_type() {
     // CHECK: [[L:%[0-9]+]] = core.lazy.op {
diff --git a/test/vast/Dialect/Core/binlop-b.c b/test/vast/Dialect/Core/binlop-b.c
index 0e2d36418f..d49f224513 100644
--- a/test/vast/Dialect/Core/binlop-b.c
+++ b/test/vast/Dialect/Core/binlop-b.c
@@ -1,4 +1,4 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %vast-opt --vast-hl-to-lazy-regions | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %vast-opt --vast-hl-to-lazy-regions | %file-check %s
 
 void logic_assign_to_different_type() {
     // CHECK: [[L:%[0-9]+]] = core.lazy.op {
diff --git a/test/vast/Dialect/HighLevel/add-a.c b/test/vast/Dialect/HighLevel/add-a.c
index 36be5ed22e..58efe15ce5 100644
--- a/test/vast/Dialect/HighLevel/add-a.c
+++ b/test/vast/Dialect/HighLevel/add-a.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 void plus(int arg1, int arg2) {
 
diff --git a/test/vast/Dialect/HighLevel/addfloat-a.c b/test/vast/Dialect/HighLevel/addfloat-a.c
index 15abff6d6d..15dab1b798 100644
--- a/test/vast/Dialect/HighLevel/addfloat-a.c
+++ b/test/vast/Dialect/HighLevel/addfloat-a.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 void plus(float arg1, float arg2) {
 
diff --git a/test/vast/Dialect/HighLevel/alignof-a.c b/test/vast/Dialect/HighLevel/alignof-a.c
index b969d278b6..cacb00b2ae 100644
--- a/test/vast/Dialect/HighLevel/alignof-a.c
+++ b/test/vast/Dialect/HighLevel/alignof-a.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 int main() {
     // CHECK: hl.alignof.type !hl.int -> !hl.long< unsigned >
diff --git a/test/vast/Dialect/HighLevel/alignof-b.c b/test/vast/Dialect/HighLevel/alignof-b.cpp
similarity index 64%
rename from test/vast/Dialect/HighLevel/alignof-b.c
rename to test/vast/Dialect/HighLevel/alignof-b.cpp
index 33bcfcf03a..b2539a0f5c 100644
--- a/test/vast/Dialect/HighLevel/alignof-b.c
+++ b/test/vast/Dialect/HighLevel/alignof-b.cpp
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -Wno-gnu-statement-expression --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -Wno-gnu-statement-expression --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl -Wno-gnu-statement-expression %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl -Wno-gnu-statement-expression %s -o %t && %vast-opt %t | diff -B %t -
 
 int main() {
     // CHECK: hl.alignof.type !hl.int -> !hl.long< unsigned >
diff --git a/test/vast/Dialect/HighLevel/array-a.c b/test/vast/Dialect/HighLevel/array-a.c
index f454a190b7..87b02c96c4 100644
--- a/test/vast/Dialect/HighLevel/array-a.c
+++ b/test/vast/Dialect/HighLevel/array-a.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 // CHECK: hl.var "ai" : !hl.lvalue<!hl.array<10, !hl.int>>
 int ai[10];
diff --git a/test/vast/Dialect/HighLevel/array-b.c b/test/vast/Dialect/HighLevel/array-b.c
index 3dcb2c174c..03ffc4728d 100644
--- a/test/vast/Dialect/HighLevel/array-b.c
+++ b/test/vast/Dialect/HighLevel/array-b.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 // CHECK: hl.var "earr" sc_extern : !hl.lvalue<!hl.array<?, !hl.int>>
 extern int earr[];
diff --git a/test/vast/Dialect/HighLevel/array-c.c b/test/vast/Dialect/HighLevel/array-c.c
index 1ac43a9c2c..bd2191295a 100644
--- a/test/vast/Dialect/HighLevel/array-c.c
+++ b/test/vast/Dialect/HighLevel/array-c.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 // CHECK: hl.var "cai" : !hl.lvalue<!hl.array<3, !hl.int< const >>> = {
 // CHECK:   [[V1:%[0-9]+]] = hl.const #core.integer<1> : !hl.int
diff --git a/test/vast/Dialect/HighLevel/array-d.c b/test/vast/Dialect/HighLevel/array-d.c
index 73a08753f9..87e5b7a8d1 100644
--- a/test/vast/Dialect/HighLevel/array-d.c
+++ b/test/vast/Dialect/HighLevel/array-d.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 // TODO decl.ref registers
 
diff --git a/test/vast/Dialect/HighLevel/array-e.c b/test/vast/Dialect/HighLevel/array-e.c
index b4191526cd..af773424d3 100644
--- a/test/vast/Dialect/HighLevel/array-e.c
+++ b/test/vast/Dialect/HighLevel/array-e.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 void foo(int size) {
     // CHECK: hl.var "arr" : !hl.lvalue<!hl.array<?, !hl.int>> allocation_size {
diff --git a/test/vast/Dialect/HighLevel/assign-a.c b/test/vast/Dialect/HighLevel/assign-a.c
index 6cad9e1930..28edba4601 100644
--- a/test/vast/Dialect/HighLevel/assign-a.c
+++ b/test/vast/Dialect/HighLevel/assign-a.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 int a, b;
 
diff --git a/test/vast/Dialect/HighLevel/assign-b.c b/test/vast/Dialect/HighLevel/assign-b.c
index e6c13b25d3..b3632f93bd 100644
--- a/test/vast/Dialect/HighLevel/assign-b.c
+++ b/test/vast/Dialect/HighLevel/assign-b.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 short a;
 
diff --git a/test/vast/Dialect/HighLevel/attr-a.c b/test/vast/Dialect/HighLevel/attr-a.c
index 38d6ea5c83..995e8675e2 100644
--- a/test/vast/Dialect/HighLevel/attr-a.c
+++ b/test/vast/Dialect/HighLevel/attr-a.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 // CHECK: hl.typedef "u64" : !hl.longlong< unsigned >
 typedef unsigned long long u64;
diff --git a/test/vast/Dialect/HighLevel/bit-field-a.c b/test/vast/Dialect/HighLevel/bit-field-a.c
index d002d98409..3a52d88005 100644
--- a/test/vast/Dialect/HighLevel/bit-field-a.c
+++ b/test/vast/Dialect/HighLevel/bit-field-a.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 struct S1 {
     // CHECK: hl.field "a" : !hl.int< unsigned >
diff --git a/test/vast/Dialect/HighLevel/bits-a.c b/test/vast/Dialect/HighLevel/bits-a.c
index 6f154f2710..5a334eb4f8 100644
--- a/test/vast/Dialect/HighLevel/bits-a.c
+++ b/test/vast/Dialect/HighLevel/bits-a.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 #define CHAR_BIT 8
 
diff --git a/test/vast/Dialect/HighLevel/bits-b.c b/test/vast/Dialect/HighLevel/bits-b.c
index fd0e6b74f9..a0351abeb8 100644
--- a/test/vast/Dialect/HighLevel/bits-b.c
+++ b/test/vast/Dialect/HighLevel/bits-b.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 // CHECK: hl.func @oposite_signs ([[A1:%arg[0-9]+]]: !hl.lvalue<!hl.int>, [[A2:%arg[0-9]+]]: !hl.lvalue<!hl.int>) -> !hl.bool {
 _Bool oposite_signs(int x, int y) {
diff --git a/test/vast/Dialect/HighLevel/branch-a.cpp b/test/vast/Dialect/HighLevel/branch-a.cpp
index 8d6b0021ef..dd44c0551a 100644
--- a/test/vast/Dialect/HighLevel/branch-a.cpp
+++ b/test/vast/Dialect/HighLevel/branch-a.cpp
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --from-source %s | %file-check %s
-// RUN: %vast-cc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 // CHECK-LABEL: hl.func @_Z10branch_retii
 int branch_ret(int a, int b)
@@ -18,7 +18,6 @@ int branch_ret(int a, int b)
         // CHECK: hl.return [[V3]]
         return 1;
     }
-    // CHECK: hl.unreachable
 }
 
 // CHECK-LABEL: hl.func @_Z11branch_thenii
diff --git a/test/vast/Dialect/HighLevel/calls-a.c b/test/vast/Dialect/HighLevel/calls-a.c
index 527eabf142..fa3cedb428 100644
--- a/test/vast/Dialect/HighLevel/calls-a.c
+++ b/test/vast/Dialect/HighLevel/calls-a.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 int constant() { return 7; }
 
diff --git a/test/vast/Dialect/HighLevel/calls-b.c b/test/vast/Dialect/HighLevel/calls-b.c
index 412b8d1fa1..9cdbb65d49 100644
--- a/test/vast/Dialect/HighLevel/calls-b.c
+++ b/test/vast/Dialect/HighLevel/calls-b.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 // CHECK: @factorial ([[A1:%arg[0-9]+]]: !hl.lvalue<!hl.int>) -> !hl.int
 int factorial(int i) {
diff --git a/test/vast/Dialect/HighLevel/calls-c.c b/test/vast/Dialect/HighLevel/calls-c.c
index e1e7e38d9a..53d6643aeb 100644
--- a/test/vast/Dialect/HighLevel/calls-c.c
+++ b/test/vast/Dialect/HighLevel/calls-c.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 // REQUIRES: typedef-pointer-like-inference
 
 // CHECK: hl.typedef "operation" : !hl.ptr<(!hl.int, !hl.int) -> !hl.int>
diff --git a/test/vast/Dialect/HighLevel/calls-d.c b/test/vast/Dialect/HighLevel/calls-d.c
index 31002f85aa..8c1f4ea487 100644
--- a/test/vast/Dialect/HighLevel/calls-d.c
+++ b/test/vast/Dialect/HighLevel/calls-d.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --ccopts -std=c89 --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --ccopts -std=c89 --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl -std=c89 %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl -std=c89 %s -o %t && %vast-opt %t | diff -B %t -
 
 int main()
 {
diff --git a/test/vast/Dialect/HighLevel/cast-a.cpp b/test/vast/Dialect/HighLevel/cast-a.cpp
index f84fe53870..24f6f77e40 100644
--- a/test/vast/Dialect/HighLevel/cast-a.cpp
+++ b/test/vast/Dialect/HighLevel/cast-a.cpp
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --from-source %s | %file-check %s
-// RUN: %vast-cc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 // CHECK-LABEL: hl.func @_Z11cast_cstylev
 void cast_cstyle()
diff --git a/test/vast/Dialect/HighLevel/cast-b.c b/test/vast/Dialect/HighLevel/cast-b.c
index e1674af683..d2a505b2fa 100644
--- a/test/vast/Dialect/HighLevel/cast-b.c
+++ b/test/vast/Dialect/HighLevel/cast-b.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 // CHECK: hl.typedef "function_type" : !core.fn<(!hl.lvalue<!hl.int>, !hl.lvalue<!hl.int>) -> (!hl.int)>
 typedef int function_type(int a, int b);
diff --git a/test/vast/Dialect/HighLevel/class-a.cpp b/test/vast/Dialect/HighLevel/class-a.cpp
index 59fc574ac8..0eff8eeadf 100644
--- a/test/vast/Dialect/HighLevel/class-a.cpp
+++ b/test/vast/Dialect/HighLevel/class-a.cpp
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --from-source %s | %file-check %s
-// RUN: %vast-cc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 // REQUIRES: c++
 
 
diff --git a/test/vast/Dialect/HighLevel/cmp-a.c b/test/vast/Dialect/HighLevel/cmp-a.c
index 121c157107..c1f7e77f07 100644
--- a/test/vast/Dialect/HighLevel/cmp-a.c
+++ b/test/vast/Dialect/HighLevel/cmp-a.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 typedef unsigned long int uintptr_t;
 
diff --git a/test/vast/Dialect/HighLevel/comma-a.c b/test/vast/Dialect/HighLevel/comma-a.c
index 47ba87250f..1039971768 100644
--- a/test/vast/Dialect/HighLevel/comma-a.c
+++ b/test/vast/Dialect/HighLevel/comma-a.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 int comma1(int a, int b)
 {
diff --git a/test/vast/Dialect/HighLevel/comma-b.c b/test/vast/Dialect/HighLevel/comma-b.c
index e50ea2fcf9..5fd1490e0a 100644
--- a/test/vast/Dialect/HighLevel/comma-b.c
+++ b/test/vast/Dialect/HighLevel/comma-b.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 void f0(int* a) {(*a)++; }
 int f1(int* a) {(*a)++; return *a;}
 
diff --git a/test/vast/Dialect/HighLevel/constants-a.c b/test/vast/Dialect/HighLevel/constants-a.c
index 5b867756b2..288bce17f3 100644
--- a/test/vast/Dialect/HighLevel/constants-a.c
+++ b/test/vast/Dialect/HighLevel/constants-a.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 // CHECK: hl.var "i" : !hl.lvalue<!hl.int>
 // CHECK:   hl.const #core.integer<0> : !hl.int
diff --git a/test/vast/Dialect/HighLevel/decayed-type-a.c b/test/vast/Dialect/HighLevel/decayed-type-a.c
index 487ec0febc..d75c162657 100644
--- a/test/vast/Dialect/HighLevel/decayed-type-a.c
+++ b/test/vast/Dialect/HighLevel/decayed-type-a.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 // CHECK: hl.func @f ({{.*}}: !hl.lvalue<!hl.decayed<!hl.ptr<!hl.int>>>)
 void f(int i[]) {
diff --git a/test/vast/Dialect/HighLevel/divfloat-a.c b/test/vast/Dialect/HighLevel/divfloat-a.c
index 779bc6e572..1407ad151e 100644
--- a/test/vast/Dialect/HighLevel/divfloat-a.c
+++ b/test/vast/Dialect/HighLevel/divfloat-a.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 void div(float arg1, float arg2) {
 
diff --git a/test/vast/Dialect/HighLevel/divsigned-a.c b/test/vast/Dialect/HighLevel/divsigned-a.c
index 33006b19e9..a03df32098 100644
--- a/test/vast/Dialect/HighLevel/divsigned-a.c
+++ b/test/vast/Dialect/HighLevel/divsigned-a.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 void div(int arg1, int arg2) {
 
diff --git a/test/vast/Dialect/HighLevel/divunsigned-a.c b/test/vast/Dialect/HighLevel/divunsigned-a.c
index e61476f05f..4245260d74 100644
--- a/test/vast/Dialect/HighLevel/divunsigned-a.c
+++ b/test/vast/Dialect/HighLevel/divunsigned-a.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 void div(unsigned int arg1, unsigned int arg2) {
 
diff --git a/test/vast/Dialect/HighLevel/dowhile-a.cpp b/test/vast/Dialect/HighLevel/dowhile-a.cpp
index 1782c3c4ef..d813815f6f 100644
--- a/test/vast/Dialect/HighLevel/dowhile-a.cpp
+++ b/test/vast/Dialect/HighLevel/dowhile-a.cpp
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --from-source %s | %file-check %s
-// RUN: %vast-cc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 // CHECK-LABEL: hl.func @_Z5basicv
 void basic() {
diff --git a/test/vast/Dialect/HighLevel/empty-decl-a.c b/test/vast/Dialect/HighLevel/empty-decl-a.c
index 83612325f7..56ba777b08 100644
--- a/test/vast/Dialect/HighLevel/empty-decl-a.c
+++ b/test/vast/Dialect/HighLevel/empty-decl-a.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 // CHECK: hl.empty.decl
 ;
diff --git a/test/vast/Dialect/HighLevel/enum-a.c b/test/vast/Dialect/HighLevel/enum-a.c
index d4e525003b..89fdb47ddf 100644
--- a/test/vast/Dialect/HighLevel/enum-a.c
+++ b/test/vast/Dialect/HighLevel/enum-a.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 // CHECK: hl.enum "color" : !hl.int< unsigned > {
 // CHECK:  hl.enum.const "RED" = #core.integer<0> : !hl.int
diff --git a/test/vast/Dialect/HighLevel/enum-b.c b/test/vast/Dialect/HighLevel/enum-b.c
index 5a86369bfb..1192f892e3 100644
--- a/test/vast/Dialect/HighLevel/enum-b.c
+++ b/test/vast/Dialect/HighLevel/enum-b.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 int puts(const char *str);
 
diff --git a/test/vast/Dialect/HighLevel/enum-c.c b/test/vast/Dialect/HighLevel/enum-c.c
index 5f27ca8d14..f784720fcc 100644
--- a/test/vast/Dialect/HighLevel/enum-c.c
+++ b/test/vast/Dialect/HighLevel/enum-c.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 // CHECK: hl.enum "Foo" : !hl.int< unsigned >
 // CHECK:  hl.enum.const "A" = #core.integer<0> : !hl.int
diff --git a/test/vast/Dialect/HighLevel/enum-d.c b/test/vast/Dialect/HighLevel/enum-d.c
index d04f556884..6ca3452f69 100644
--- a/test/vast/Dialect/HighLevel/enum-d.c
+++ b/test/vast/Dialect/HighLevel/enum-d.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 // CHECK: hl.enum "color" : !hl.int< unsigned >
 enum color { RED, GREEN, BLUE };
diff --git a/test/vast/Dialect/HighLevel/enum-e.c b/test/vast/Dialect/HighLevel/enum-e.c
index e394d811ec..e06e86a812 100644
--- a/test/vast/Dialect/HighLevel/enum-e.c
+++ b/test/vast/Dialect/HighLevel/enum-e.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 // CHECK: hl.struct "Element"
 // CHECK:  hl.field "z" : !hl.int
diff --git a/test/vast/Dialect/HighLevel/expr-a.c b/test/vast/Dialect/HighLevel/expr-a.c
index 38dba9e4ef..f669267bd5 100644
--- a/test/vast/Dialect/HighLevel/expr-a.c
+++ b/test/vast/Dialect/HighLevel/expr-a.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 // CHECK: assign_to_lvalue_expr ([[A:%arg[0-9]+]]: !hl.lvalue<!hl.ptr<!hl.int>>)
 void assign_to_lvalue_expr(int *a) {
diff --git a/test/vast/Dialect/HighLevel/floats-a.c b/test/vast/Dialect/HighLevel/floats-a.c
index 6d90046b5d..994431fbb1 100644
--- a/test/vast/Dialect/HighLevel/floats-a.c
+++ b/test/vast/Dialect/HighLevel/floats-a.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 // CHECK: hl.var "fp16" : !hl.lvalue<!hl.half>
 __fp16 fp16 = 0.5;
diff --git a/test/vast/Dialect/HighLevel/fun-redecl-a.c b/test/vast/Dialect/HighLevel/fun-redecl-a.c
index 13454ede13..0dd1e607c6 100644
--- a/test/vast/Dialect/HighLevel/fun-redecl-a.c
+++ b/test/vast/Dialect/HighLevel/fun-redecl-a.c
@@ -1,4 +1,4 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
 
 // CHECK: hl.func @abort
 // CHECK-NOT: hl.func @abort
@@ -6,4 +6,6 @@
 
 void abort();
 void abort();
-int main() {}
+int main() {
+    return 0;
+}
diff --git a/test/vast/Dialect/HighLevel/fun-redecl-b.c b/test/vast/Dialect/HighLevel/fun-redecl-b.c
index 85b6cd29f2..4e38333eb0 100644
--- a/test/vast/Dialect/HighLevel/fun-redecl-b.c
+++ b/test/vast/Dialect/HighLevel/fun-redecl-b.c
@@ -1,4 +1,4 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
 
 // CHECK: hl.func @abort
 // CHECK-NOT: hl.func @abort
diff --git a/test/vast/Dialect/HighLevel/fun-redecl-c.c b/test/vast/Dialect/HighLevel/fun-redecl-c.c
index 9693c757ab..386c6c9ee7 100644
--- a/test/vast/Dialect/HighLevel/fun-redecl-c.c
+++ b/test/vast/Dialect/HighLevel/fun-redecl-c.c
@@ -1,4 +1,4 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
 
 // CHECK: hl.func @abort
 // CHECK-NOT: hl.func @abort
diff --git a/test/vast/Dialect/HighLevel/glob-a.c b/test/vast/Dialect/HighLevel/glob-a.c
index aa9d63c500..3c9113a45b 100644
--- a/test/vast/Dialect/HighLevel/glob-a.c
+++ b/test/vast/Dialect/HighLevel/glob-a.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 // CHECK: hl.var "a" : !hl.lvalue<!hl.int>
 int a = 0;
diff --git a/test/vast/Dialect/HighLevel/goto-a.c b/test/vast/Dialect/HighLevel/goto-a.c
index fc6951158b..3cce1d951d 100644
--- a/test/vast/Dialect/HighLevel/goto-a.c
+++ b/test/vast/Dialect/HighLevel/goto-a.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 int main() {
     // CHECK: [[L:%[0-9]+]] = hl.label.decl "end" : !hl.label
diff --git a/test/vast/Dialect/HighLevel/goto-b.c b/test/vast/Dialect/HighLevel/goto-b.c
index ca9c945847..e5dfc6a037 100644
--- a/test/vast/Dialect/HighLevel/goto-b.c
+++ b/test/vast/Dialect/HighLevel/goto-b.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 // REQUIRES: indirect-goto
 
 void foo(int test) {
diff --git a/test/vast/Dialect/HighLevel/indirect-call-a.c b/test/vast/Dialect/HighLevel/indirect-call-a.c
index 76f517aa81..496ade786b 100644
--- a/test/vast/Dialect/HighLevel/indirect-call-a.c
+++ b/test/vast/Dialect/HighLevel/indirect-call-a.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 // CHECK: hl.typedef "ck_rv_t" : !hl.long< unsigned >
 typedef unsigned long ck_rv_t;
diff --git a/test/vast/Dialect/HighLevel/libc-a.c b/test/vast/Dialect/HighLevel/libc-a.c
index d0d0302776..6cb69978b9 100644
--- a/test/vast/Dialect/HighLevel/libc-a.c
+++ b/test/vast/Dialect/HighLevel/libc-a.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 // REQUIRES: libc
 
 #include <stdio.h>
diff --git a/test/vast/Dialect/HighLevel/linkage-a.c b/test/vast/Dialect/HighLevel/linkage-a.c
index 065c8a6df0..814ade6aba 100644
--- a/test/vast/Dialect/HighLevel/linkage-a.c
+++ b/test/vast/Dialect/HighLevel/linkage-a.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 // CHECK: hl.func @foo internal
 static void foo(void) {}
diff --git a/test/vast/Dialect/HighLevel/literals-a.c b/test/vast/Dialect/HighLevel/literals-a.c
index 41c425ec93..b65fe1f4d4 100644
--- a/test/vast/Dialect/HighLevel/literals-a.c
+++ b/test/vast/Dialect/HighLevel/literals-a.c
@@ -1,5 +1,5 @@
-// // RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// // RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// // RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// // RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 // CHECK: hl.var "li" : !hl.lvalue<!hl.int< const >>
 // CHECK: hl.const #core.integer<10> : !hl.int
diff --git a/test/vast/Dialect/HighLevel/loop-a.cpp b/test/vast/Dialect/HighLevel/loop-a.cpp
index 2a957126c9..d0ec4d1cac 100644
--- a/test/vast/Dialect/HighLevel/loop-a.cpp
+++ b/test/vast/Dialect/HighLevel/loop-a.cpp
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --from-source %s | %file-check %s
-// RUN: %vast-cc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 // CHECK-LABEL: hl.func @_Z11loop_simplev
 void loop_simple()
diff --git a/test/vast/Dialect/HighLevel/main-a.c b/test/vast/Dialect/HighLevel/main-a.c
index 887f59ee65..a1e9d10bd7 100644
--- a/test/vast/Dialect/HighLevel/main-a.c
+++ b/test/vast/Dialect/HighLevel/main-a.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 // CHECK-LABEL: hl.func @main () -> !hl.int
 int main() {}
diff --git a/test/vast/Dialect/HighLevel/mul-a.c b/test/vast/Dialect/HighLevel/mul-a.c
index ec1ef882ed..109e4847d6 100644
--- a/test/vast/Dialect/HighLevel/mul-a.c
+++ b/test/vast/Dialect/HighLevel/mul-a.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 void plus(int arg1, int arg2) {
 
diff --git a/test/vast/Dialect/HighLevel/mulfloat-a.c b/test/vast/Dialect/HighLevel/mulfloat-a.c
index 4dfcf00911..50cc460f15 100644
--- a/test/vast/Dialect/HighLevel/mulfloat-a.c
+++ b/test/vast/Dialect/HighLevel/mulfloat-a.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 void plus(float arg1, float arg2) {
 
diff --git a/test/vast/Dialect/HighLevel/ops-a.c b/test/vast/Dialect/HighLevel/ops-a.c
index 6973abf22d..abd53a3620 100644
--- a/test/vast/Dialect/HighLevel/ops-a.c
+++ b/test/vast/Dialect/HighLevel/ops-a.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 // CHECK: hl.func @add1 ([[A1:%arg[0-9]+]]: !hl.lvalue<!hl.int>, [[A2:%arg[0-9]+]]: !hl.lvalue<!hl.int>) -> !hl.int
 int add1(int a, int b)
diff --git a/test/vast/Dialect/HighLevel/ops-b.c b/test/vast/Dialect/HighLevel/ops-b.c
index 66f6642a80..b23cac02c7 100644
--- a/test/vast/Dialect/HighLevel/ops-b.c
+++ b/test/vast/Dialect/HighLevel/ops-b.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 // CHECK: hl.func @arithemtic_signed ([[A1:%arg[0-9]+]]: !hl.lvalue<!hl.int>, [[A2:%arg[0-9]+]]: !hl.lvalue<!hl.int>)
 void arithemtic_signed(int a, int b)
diff --git a/test/vast/Dialect/HighLevel/ops-c.c b/test/vast/Dialect/HighLevel/ops-c.c
index d4aa7f0dee..94a8b359fb 100644
--- a/test/vast/Dialect/HighLevel/ops-c.c
+++ b/test/vast/Dialect/HighLevel/ops-c.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 void bit_ops(int a, int b) {
     // CHECK: [[V1:%[0-9]+]] = hl.ref %arg0
diff --git a/test/vast/Dialect/HighLevel/ops-d.c b/test/vast/Dialect/HighLevel/ops-d.c
index 376e79fed3..3ffe6a3a3c 100644
--- a/test/vast/Dialect/HighLevel/ops-d.c
+++ b/test/vast/Dialect/HighLevel/ops-d.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 void unary_inplace(int a) {
     // CHECK: hl.var "pre" : !hl.lvalue<!hl.int>
diff --git a/test/vast/Dialect/HighLevel/ops-e.c b/test/vast/Dialect/HighLevel/ops-e.c
index 1c16731c96..191de89093 100644
--- a/test/vast/Dialect/HighLevel/ops-e.c
+++ b/test/vast/Dialect/HighLevel/ops-e.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 void assign_assign() {
     int a, b, c;
diff --git a/test/vast/Dialect/HighLevel/ops-f.c b/test/vast/Dialect/HighLevel/ops-f.c
index 2f9e9f0ecb..a4c4a56b22 100644
--- a/test/vast/Dialect/HighLevel/ops-f.c
+++ b/test/vast/Dialect/HighLevel/ops-f.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 int ptr_cmp(void *a, void *b) {
     // CHECK: hl.cmp eq [[A:%[0-9]+]], [[B:%[0-9]+]] : !hl.ptr<!hl.void>, !hl.ptr<!hl.void> -> !hl.int
diff --git a/test/vast/Dialect/HighLevel/ops-g.c b/test/vast/Dialect/HighLevel/ops-g.c
index 77fac342f0..bf239bd1a2 100644
--- a/test/vast/Dialect/HighLevel/ops-g.c
+++ b/test/vast/Dialect/HighLevel/ops-g.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 void logic_assign_to_different_type() {
     // CHECK: hl.bin.lor {
diff --git a/test/vast/Dialect/HighLevel/ops-h.c b/test/vast/Dialect/HighLevel/ops-h.c
index 3fa7e9b5b3..2b217b0608 100644
--- a/test/vast/Dialect/HighLevel/ops-h.c
+++ b/test/vast/Dialect/HighLevel/ops-h.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 // CHECK: hl.func @arithemtic_int_short ([[A1:%arg[0-9]+]]: !hl.lvalue<!hl.int>, [[A2:%arg[0-9]+]]: !hl.lvalue<!hl.short>)
 void arithemtic_int_short(int a, short b)
diff --git a/test/vast/Dialect/HighLevel/pointerops-a.c b/test/vast/Dialect/HighLevel/pointerops-a.c
index 7a5f451c07..f2112275e5 100644
--- a/test/vast/Dialect/HighLevel/pointerops-a.c
+++ b/test/vast/Dialect/HighLevel/pointerops-a.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 void add(int* a, int b) {
     // CHECK: [[A1:%[0-9]+]] = hl.add [[B1:%[0-9]+]], [[C1:%[0-9]+]] : (!hl.ptr<!hl.int>, !hl.int) -> !hl.ptr<!hl.int>
diff --git a/test/vast/Dialect/HighLevel/pointers-a.c b/test/vast/Dialect/HighLevel/pointers-a.c
index c706a5c73e..4fa72efcc4 100644
--- a/test/vast/Dialect/HighLevel/pointers-a.c
+++ b/test/vast/Dialect/HighLevel/pointers-a.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 // CHECK: hl.var "vp" : !hl.lvalue<!hl.ptr<!hl.void>>
 void * vp = 0;
diff --git a/test/vast/Dialect/HighLevel/pointers-b.c b/test/vast/Dialect/HighLevel/pointers-b.c
index 1fed4e612a..084fb52efc 100644
--- a/test/vast/Dialect/HighLevel/pointers-b.c
+++ b/test/vast/Dialect/HighLevel/pointers-b.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 // CHECK: hl.var "p" : !hl.lvalue<!hl.ptr<!hl.float>>
 // CHECK: hl.var "pp" : !hl.lvalue<!hl.ptr<!hl.ptr<!hl.float>>>
diff --git a/test/vast/Dialect/HighLevel/pointers-c.c b/test/vast/Dialect/HighLevel/pointers-c.c
index 5bbd1d464a..a58434436a 100644
--- a/test/vast/Dialect/HighLevel/pointers-c.c
+++ b/test/vast/Dialect/HighLevel/pointers-c.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 // CHECK: hl.var "p" : !hl.lvalue<!hl.ptr<!hl.int>>
 // CHECK:   ArrayToPointerDecay : !hl.lvalue<!hl.array<2, !hl.int>> -> !hl.ptr<!hl.int>
diff --git a/test/vast/Dialect/HighLevel/pointers-d.c b/test/vast/Dialect/HighLevel/pointers-d.c
index bc96438bb3..879efc2842 100644
--- a/test/vast/Dialect/HighLevel/pointers-d.c
+++ b/test/vast/Dialect/HighLevel/pointers-d.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 void f(int);
 // CHECK: hl.var "pf1" : !hl.lvalue<!hl.ptr<!hl.paren<!core.fn<(!hl.lvalue<!hl.int>) -> (!hl.void)>>>>
diff --git a/test/vast/Dialect/HighLevel/pointers-e.c b/test/vast/Dialect/HighLevel/pointers-e.c
index 6abc831d74..2796296579 100644
--- a/test/vast/Dialect/HighLevel/pointers-e.c
+++ b/test/vast/Dialect/HighLevel/pointers-e.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 int f();
 
diff --git a/test/vast/Dialect/HighLevel/pointers-f.c b/test/vast/Dialect/HighLevel/pointers-f.c
index 12ad8a7e10..949e6ce7cd 100644
--- a/test/vast/Dialect/HighLevel/pointers-f.c
+++ b/test/vast/Dialect/HighLevel/pointers-f.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 int f(int), fc(const int);
 
diff --git a/test/vast/Dialect/HighLevel/pointers-g.c b/test/vast/Dialect/HighLevel/pointers-g.c
index 22bef36b21..3f737fa216 100644
--- a/test/vast/Dialect/HighLevel/pointers-g.c
+++ b/test/vast/Dialect/HighLevel/pointers-g.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 int main() {
     // CHECK: [[N:%[0-9]+]] = hl.var "n" : !hl.lvalue<!hl.int>
diff --git a/test/vast/Dialect/HighLevel/prototypes-a.c b/test/vast/Dialect/HighLevel/prototypes-a.c
index cafb4dd725..b73c8f1f8a 100644
--- a/test/vast/Dialect/HighLevel/prototypes-a.c
+++ b/test/vast/Dialect/HighLevel/prototypes-a.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 short b(void);
 // CHECK: func @b () -> !hl.short
diff --git a/test/vast/Dialect/HighLevel/qualifiers-a.cpp b/test/vast/Dialect/HighLevel/qualifiers-a.cpp
index 23ecf2c1e0..67495994b2 100644
--- a/test/vast/Dialect/HighLevel/qualifiers-a.cpp
+++ b/test/vast/Dialect/HighLevel/qualifiers-a.cpp
@@ -1,59 +1,61 @@
-// RUN: %vast-cc --from-source %s | %file-check %s
-// RUN: %vast-cc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
-// CHECK: hl.var "i" : !hl.lvalue<!hl.int>
-int i;
+void scope() {
+    // CHECK: hl.var "i" : !hl.lvalue<!hl.int>
+    int i;
 
-// CHECK: hl.var "u" : !hl.lvalue<!hl.int< unsigned >>
-unsigned u;
+    // CHECK: hl.var "u" : !hl.lvalue<!hl.int< unsigned >>
+    unsigned u;
 
-// CHECK: hl.var "s" : !hl.lvalue<!hl.int>
-signed s;
+    // CHECK: hl.var "s" : !hl.lvalue<!hl.int>
+    signed s;
 
-// CHECK: hl.var "ui" : !hl.lvalue<!hl.int< unsigned >>
-unsigned int ui;
+    // CHECK: hl.var "ui" : !hl.lvalue<!hl.int< unsigned >>
+    unsigned int ui;
 
-// CHECK: hl.var "us" : !hl.lvalue<!hl.short< unsigned >>
-unsigned short us;
+    // CHECK: hl.var "us" : !hl.lvalue<!hl.short< unsigned >>
+    unsigned short us;
 
-// CHECK: hl.var "ci" : !hl.lvalue<!hl.int< const >> = {
-// CHECK: [[C1:%[0-9]+]] = hl.const #core.integer<0> : !hl.int
-// CHECK: hl.value.yield [[C1]]
-const int ci = 0;
+    // CHECK: hl.var "ci" : !hl.lvalue<!hl.int< const >> = {
+    // CHECK: [[C1:%[0-9]+]] = hl.const #core.integer<0> : !hl.int
+    // CHECK: hl.value.yield [[C1]]
+    const int ci = 0;
 
-// CHECK: hl.var "cui" : !hl.lvalue<!hl.int< unsigned, const >> = {
-// CHECK: [[C2:%[0-9]+]] = hl.const #core.integer<0> : !hl.int< unsigned >
-// CHECK: hl.value.yield [[C2]]
-const unsigned cui = 0U;
+    // CHECK: hl.var "cui" : !hl.lvalue<!hl.int< unsigned, const >> = {
+    // CHECK: [[C2:%[0-9]+]] = hl.const #core.integer<0> : !hl.int< unsigned >
+    // CHECK: hl.value.yield [[C2]]
+    const unsigned cui = 0U;
 
-// CHECK: hl.var "vi" : !hl.lvalue<!hl.int< volatile >>
-volatile int vi;
+    // CHECK: hl.var "vi" : !hl.lvalue<!hl.int< volatile >>
+    volatile int vi;
 
-// CHECK: hl.var "vui" : !hl.lvalue<!hl.int< unsigned, volatile >>
-volatile unsigned vui;
+    // CHECK: hl.var "vui" : !hl.lvalue<!hl.int< unsigned, volatile >>
+    volatile unsigned vui;
 
-// CHECK: hl.var "cvi" : !hl.lvalue<!hl.int< const, volatile >> = {
-// CHECK: [[C3:%[0-9]+]] = hl.const #core.integer<0> : !hl.int
-// CHECK: hl.value.yield [[C3]]
-const volatile int cvi = 0;
+    // CHECK: hl.var "cvi" : !hl.lvalue<!hl.int< const, volatile >> = {
+    // CHECK: [[C3:%[0-9]+]] = hl.const #core.integer<0> : !hl.int
+    // CHECK: hl.value.yield [[C3]]
+    const volatile int cvi = 0;
 
-// CHECK: hl.var "cvui" : !hl.lvalue<!hl.int< unsigned, const, volatile >> = {
-// CHECK: [[C4:%[0-9]+]] = hl.const #core.integer<0> : !hl.int< unsigned >
-// CHECK: hl.value.yield [[C4]]
-const volatile unsigned int cvui = 0U;
+    // CHECK: hl.var "cvui" : !hl.lvalue<!hl.int< unsigned, const, volatile >> = {
+    // CHECK: [[C4:%[0-9]+]] = hl.const #core.integer<0> : !hl.int< unsigned >
+    // CHECK: hl.value.yield [[C4]]
+    const volatile unsigned int cvui = 0U;
 
-// CHECK: hl.var "b" : !hl.lvalue<!hl.bool>
-bool b;
+    // CHECK: hl.var "b" : !hl.lvalue<!hl.bool>
+    bool b;
 
-// CHECK: hl.var "vb" : !hl.lvalue<!hl.bool< volatile >>
-volatile bool vb;
+    // CHECK: hl.var "vb" : !hl.lvalue<!hl.bool< volatile >>
+    volatile bool vb;
 
-// CHECK: hl.var "cb" : !hl.lvalue<!hl.bool< const >> = {
-// CHECK: [[C5:%[0-9]+]] = hl.const #false
-// CHECK: hl.value.yield [[C5]]
-const bool cb = false;
+    // CHECK: hl.var "cb" : !hl.lvalue<!hl.bool< const >> = {
+    // CHECK: [[C5:%[0-9]+]] = hl.const #false
+    // CHECK: hl.value.yield [[C5]]
+    const bool cb = false;
 
-// CHECK: hl.var "cvb" : !hl.lvalue<!hl.bool< const, volatile >> = {
-// CHECK: [[C6:%[0-9]+]] = hl.const #true
-// CHECK: hl.value.yield [[C6]]
-const volatile bool cvb = true;
+    // CHECK: hl.var "cvb" : !hl.lvalue<!hl.bool< const, volatile >> = {
+    // CHECK: [[C6:%[0-9]+]] = hl.const #true
+    // CHECK: hl.value.yield [[C6]]
+    const volatile bool cvb = true;
+}
diff --git a/test/vast/Dialect/HighLevel/qualifiers-b.c b/test/vast/Dialect/HighLevel/qualifiers-b.c
index e0f22ff899..28d0fe85ba 100644
--- a/test/vast/Dialect/HighLevel/qualifiers-b.c
+++ b/test/vast/Dialect/HighLevel/qualifiers-b.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 int main()
 {
diff --git a/test/vast/Dialect/HighLevel/qualifiers-c.cpp b/test/vast/Dialect/HighLevel/qualifiers-c.cpp
index ff2f4aab14..fb1959bb5c 100644
--- a/test/vast/Dialect/HighLevel/qualifiers-c.cpp
+++ b/test/vast/Dialect/HighLevel/qualifiers-c.cpp
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --from-source %s | %file-check %s
-// RUN: %vast-cc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 // CHECK: hl.var "p" : !hl.lvalue<!hl.ptr<!hl.void>>
 void *p;
diff --git a/test/vast/Dialect/HighLevel/qualifiers-d.c b/test/vast/Dialect/HighLevel/qualifiers-d.c
index 74e2678e25..b95fb1380c 100644
--- a/test/vast/Dialect/HighLevel/qualifiers-d.c
+++ b/test/vast/Dialect/HighLevel/qualifiers-d.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 // CHECK: @chptr (!hl.lvalue<!hl.ptr<!hl.char>>)
 void chptr(char *p);
diff --git a/test/vast/Dialect/HighLevel/qualifiers-e.c b/test/vast/Dialect/HighLevel/qualifiers-e.c
index a1ec177ef9..74ba513142 100644
--- a/test/vast/Dialect/HighLevel/qualifiers-e.c
+++ b/test/vast/Dialect/HighLevel/qualifiers-e.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 // CHECK: hl.var "ia" : !hl.lvalue<!hl.array<10, !hl.int>>
 int ia[10];
diff --git a/test/vast/Dialect/HighLevel/qualifiers-f.c b/test/vast/Dialect/HighLevel/qualifiers-f.c
index c13befcb02..d397574af3 100644
--- a/test/vast/Dialect/HighLevel/qualifiers-f.c
+++ b/test/vast/Dialect/HighLevel/qualifiers-f.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 // CHECK: @f (!hl.lvalue<!hl.int>, !hl.lvalue<!hl.int>, !hl.lvalue<!hl.decayed<!hl.ptr<!hl.array<?, !hl.float>,  restrict >>>, !hl.lvalue<!hl.decayed<!hl.ptr<!hl.array<?, !hl.float>,  restrict >>>)
 void f(int m, int n, float a[restrict m][n], float b[restrict m][n]);
diff --git a/test/vast/Dialect/HighLevel/qualifiers-g.c b/test/vast/Dialect/HighLevel/qualifiers-g.c
index b4dce88288..5feb83caa1 100644
--- a/test/vast/Dialect/HighLevel/qualifiers-g.c
+++ b/test/vast/Dialect/HighLevel/qualifiers-g.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 // CHECK: hl.var "a" : !hl.lvalue<!hl.ptr<!hl.float,  restrict >>
 // CHECK: hl.var "b" : !hl.lvalue<!hl.ptr<!hl.float,  restrict >>
diff --git a/test/vast/Dialect/HighLevel/qualifiers-h.c b/test/vast/Dialect/HighLevel/qualifiers-h.c
index 359ed35c27..29e7a491a7 100644
--- a/test/vast/Dialect/HighLevel/qualifiers-h.c
+++ b/test/vast/Dialect/HighLevel/qualifiers-h.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 // CHECK: hl.enum "e" : !hl.int< unsigned >
 enum e { a, b, c };
diff --git a/test/vast/Dialect/HighLevel/qualifiers-i.c b/test/vast/Dialect/HighLevel/qualifiers-i.c
index 67e4937c0e..e92eed737a 100644
--- a/test/vast/Dialect/HighLevel/qualifiers-i.c
+++ b/test/vast/Dialect/HighLevel/qualifiers-i.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 // CHECK: hl.union "u"
 union u { int i; double d; };
diff --git a/test/vast/Dialect/HighLevel/qualifiers-j.c b/test/vast/Dialect/HighLevel/qualifiers-j.c
index 46d710c58b..e1943d98e2 100644
--- a/test/vast/Dialect/HighLevel/qualifiers-j.c
+++ b/test/vast/Dialect/HighLevel/qualifiers-j.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 // CHECK: hl.var "fp" : !hl.lvalue<!hl.ptr<!hl.paren<!core.fn<(!hl.lvalue<!hl.int>) -> (!hl.int)>>>>
 int (*fp) (int);
diff --git a/test/vast/Dialect/HighLevel/quirks-a.c b/test/vast/Dialect/HighLevel/quirks-a.c
index 58ebfc560a..18066e936b 100644
--- a/test/vast/Dialect/HighLevel/quirks-a.c
+++ b/test/vast/Dialect/HighLevel/quirks-a.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 // adapted from https://gist.github.com/fay59/5ccbe684e6e56a7df8815c3486568f01
 
diff --git a/test/vast/Dialect/HighLevel/quirks-b.c b/test/vast/Dialect/HighLevel/quirks-b.c
index 35d3c91027..042d1fb60c 100644
--- a/test/vast/Dialect/HighLevel/quirks-b.c
+++ b/test/vast/Dialect/HighLevel/quirks-b.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 // REQUIRES: compund-literal
 
 // adapted from https://gist.github.com/fay59/5ccbe684e6e56a7df8815c3486568f01
diff --git a/test/vast/Dialect/HighLevel/quirks-c.c b/test/vast/Dialect/HighLevel/quirks-c.c
index 2d337d672f..940b86dafd 100644
--- a/test/vast/Dialect/HighLevel/quirks-c.c
+++ b/test/vast/Dialect/HighLevel/quirks-c.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 // adapted from https://gist.github.com/fay59/5ccbe684e6e56a7df8815c3486568f01
 
diff --git a/test/vast/Dialect/HighLevel/quirks-d.c b/test/vast/Dialect/HighLevel/quirks-d.c
index decd7a3ae3..afbe3214b2 100644
--- a/test/vast/Dialect/HighLevel/quirks-d.c
+++ b/test/vast/Dialect/HighLevel/quirks-d.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 // REQUIRES: static_assert
 
 // adapted from https://gist.github.com/fay59/5ccbe684e6e56a7df8815c3486568f01
diff --git a/test/vast/Dialect/HighLevel/quirks-e.c b/test/vast/Dialect/HighLevel/quirks-e.c
index e03c91d9ee..5fc593c05f 100644
--- a/test/vast/Dialect/HighLevel/quirks-e.c
+++ b/test/vast/Dialect/HighLevel/quirks-e.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 // REQUIRES: qualified-type
 
 // adapted from https://gist.github.com/fay59/5ccbe684e6e56a7df8815c3486568f01
diff --git a/test/vast/Dialect/HighLevel/quirks-f.c b/test/vast/Dialect/HighLevel/quirks-f.c
index 1b062f99a9..e6f19c0907 100644
--- a/test/vast/Dialect/HighLevel/quirks-f.c
+++ b/test/vast/Dialect/HighLevel/quirks-f.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 // adapted from https://gist.github.com/fay59/5ccbe684e6e56a7df8815c3486568f01
 
diff --git a/test/vast/Dialect/HighLevel/quirks-g.c b/test/vast/Dialect/HighLevel/quirks-g.c
index 2311937c99..d46e556921 100644
--- a/test/vast/Dialect/HighLevel/quirks-g.c
+++ b/test/vast/Dialect/HighLevel/quirks-g.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 // adapted from https://gist.github.com/fay59/5ccbe684e6e56a7df8815c3486568f01
 
diff --git a/test/vast/Dialect/HighLevel/quirks-h.c b/test/vast/Dialect/HighLevel/quirks-h.c
index 29a2ed7615..9aa829f85b 100644
--- a/test/vast/Dialect/HighLevel/quirks-h.c
+++ b/test/vast/Dialect/HighLevel/quirks-h.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 // adapted from https://gist.github.com/fay59/5ccbe684e6e56a7df8815c3486568f01
 
diff --git a/test/vast/Dialect/HighLevel/quirks-i.c b/test/vast/Dialect/HighLevel/quirks-i.c
index 8355d35a96..cf32d60e4a 100644
--- a/test/vast/Dialect/HighLevel/quirks-i.c
+++ b/test/vast/Dialect/HighLevel/quirks-i.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 // adapted from https://gist.github.com/fay59/5ccbe684e6e56a7df8815c3486568f01
 
diff --git a/test/vast/Dialect/HighLevel/quirks-j.c b/test/vast/Dialect/HighLevel/quirks-j.c
index d820a19df5..9b8df1d9d6 100644
--- a/test/vast/Dialect/HighLevel/quirks-j.c
+++ b/test/vast/Dialect/HighLevel/quirks-j.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 // adapted from https://gist.github.com/fay59/5ccbe684e6e56a7df8815c3486568f01
 
diff --git a/test/vast/Dialect/HighLevel/quirks-k.c b/test/vast/Dialect/HighLevel/quirks-k.c
index 9f1c0acf6c..e741bf7a95 100644
--- a/test/vast/Dialect/HighLevel/quirks-k.c
+++ b/test/vast/Dialect/HighLevel/quirks-k.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 // adapted from https://gist.github.com/fay59/5ccbe684e6e56a7df8815c3486568f01
 
diff --git a/test/vast/Dialect/HighLevel/quirks-l.c b/test/vast/Dialect/HighLevel/quirks-l.c
index 5fcde2426e..5b19171dda 100644
--- a/test/vast/Dialect/HighLevel/quirks-l.c
+++ b/test/vast/Dialect/HighLevel/quirks-l.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 // REQUIRES: offsetof
 
 // adapted from https://gist.github.com/fay59/5ccbe684e6e56a7df8815c3486568f01
diff --git a/test/vast/Dialect/HighLevel/quirks-m.cpp b/test/vast/Dialect/HighLevel/quirks-m.cpp
index c9dd752750..823295e955 100644
--- a/test/vast/Dialect/HighLevel/quirks-m.cpp
+++ b/test/vast/Dialect/HighLevel/quirks-m.cpp
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --from-source %s | %file-check %s
-// RUN: %vast-cc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 // adapted from https://gist.github.com/fay59/5ccbe684e6e56a7df8815c3486568f01
 
diff --git a/test/vast/Dialect/HighLevel/quirks-n.c b/test/vast/Dialect/HighLevel/quirks-n.c
index 2bf5fc7909..7e46b14299 100644
--- a/test/vast/Dialect/HighLevel/quirks-n.c
+++ b/test/vast/Dialect/HighLevel/quirks-n.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 // adapted from https://gist.github.com/fay59/5ccbe684e6e56a7df8815c3486568f01
 
diff --git a/test/vast/Dialect/HighLevel/quirks-o.c b/test/vast/Dialect/HighLevel/quirks-o.c
index 8dd945a105..0da4775d39 100644
--- a/test/vast/Dialect/HighLevel/quirks-o.c
+++ b/test/vast/Dialect/HighLevel/quirks-o.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 // adapted from https://gist.github.com/fay59/5ccbe684e6e56a7df8815c3486568f01
 
diff --git a/test/vast/Dialect/HighLevel/ref-a.c b/test/vast/Dialect/HighLevel/ref-a.c
index 82e28357ab..d1ed05f8b7 100644
--- a/test/vast/Dialect/HighLevel/ref-a.c
+++ b/test/vast/Dialect/HighLevel/ref-a.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 int main()
 {
diff --git a/test/vast/Dialect/HighLevel/ref-b.c b/test/vast/Dialect/HighLevel/ref-b.c
index 3300577989..d63d72ffb3 100644
--- a/test/vast/Dialect/HighLevel/ref-b.c
+++ b/test/vast/Dialect/HighLevel/ref-b.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 int main()
 {
diff --git a/test/vast/Dialect/HighLevel/remsigned-a.c b/test/vast/Dialect/HighLevel/remsigned-a.c
index 223035fdac..365d77e847 100644
--- a/test/vast/Dialect/HighLevel/remsigned-a.c
+++ b/test/vast/Dialect/HighLevel/remsigned-a.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 void div(int arg1, int arg2) {
 
diff --git a/test/vast/Dialect/HighLevel/remunsigned-a.c b/test/vast/Dialect/HighLevel/remunsigned-a.c
index 80f17fdbea..43c684320f 100644
--- a/test/vast/Dialect/HighLevel/remunsigned-a.c
+++ b/test/vast/Dialect/HighLevel/remunsigned-a.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 void div(unsigned int arg1, unsigned int arg2) {
 
diff --git a/test/vast/Dialect/HighLevel/return-a.c b/test/vast/Dialect/HighLevel/return-a.c
index f7c5f900e9..0ec7dc5eaa 100644
--- a/test/vast/Dialect/HighLevel/return-a.c
+++ b/test/vast/Dialect/HighLevel/return-a.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 // CHECK-LABEL: hl.func @a () -> !hl.int
 // CHECK: [[V1:%[0-9]+]] = hl.const #core.integer<7> : !hl.int
diff --git a/test/vast/Dialect/HighLevel/scope-a.c b/test/vast/Dialect/HighLevel/scope-a.c
index a034a651c0..31e0c884c2 100644
--- a/test/vast/Dialect/HighLevel/scope-a.c
+++ b/test/vast/Dialect/HighLevel/scope-a.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 // CHECK-LABEL: hl.func @test1 () -> !hl.int
 int test1()
diff --git a/test/vast/Dialect/HighLevel/sizeof-a.c b/test/vast/Dialect/HighLevel/sizeof-a.c
index acd9dc586b..26d788439b 100644
--- a/test/vast/Dialect/HighLevel/sizeof-a.c
+++ b/test/vast/Dialect/HighLevel/sizeof-a.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 int main() {
     // CHECK: hl.sizeof.type !hl.int -> !hl.long< unsigned >
diff --git a/test/vast/Dialect/HighLevel/stmt-expr-a.c b/test/vast/Dialect/HighLevel/stmt-expr-a.c
index 335475f792..756cbc337c 100644
--- a/test/vast/Dialect/HighLevel/stmt-expr-a.c
+++ b/test/vast/Dialect/HighLevel/stmt-expr-a.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 int main() {
     // CHECK: hl.stmt.expr : !hl.int
diff --git a/test/vast/Dialect/HighLevel/storage-a.c b/test/vast/Dialect/HighLevel/storage-a.c
index 136c8d3b4d..67bbc7b37c 100644
--- a/test/vast/Dialect/HighLevel/storage-a.c
+++ b/test/vast/Dialect/HighLevel/storage-a.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 // CHECK: hl.var "i" : !hl.lvalue<!hl.int>
 int i;
diff --git a/test/vast/Dialect/HighLevel/string-a.c b/test/vast/Dialect/HighLevel/string-a.c
index 9b818b1a68..4affc69cc8 100644
--- a/test/vast/Dialect/HighLevel/string-a.c
+++ b/test/vast/Dialect/HighLevel/string-a.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 // CHECK: hl.var "gstr" : !hl.lvalue<!hl.ptr<!hl.char< const >>>
 // CHECK: hl.const #core.strlit<"global"> : !hl.lvalue<!hl.array<7, !hl.char>>
diff --git a/test/vast/Dialect/HighLevel/string-b.c b/test/vast/Dialect/HighLevel/string-b.c
index 022a6a2182..cff93b61a9 100644
--- a/test/vast/Dialect/HighLevel/string-b.c
+++ b/test/vast/Dialect/HighLevel/string-b.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 // CHECK: hl.var "gstr" : !hl.lvalue<!hl.ptr<!hl.char< const >>>
 // CHECK:   hl.const #core.strlit<"global\n"> : !hl.lvalue<!hl.array<8, !hl.char>>
diff --git a/test/vast/Dialect/HighLevel/struct-a.c b/test/vast/Dialect/HighLevel/struct-a.c
index 7ac1460d0d..bdaa79dd5d 100644
--- a/test/vast/Dialect/HighLevel/struct-a.c
+++ b/test/vast/Dialect/HighLevel/struct-a.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 // CHECK: hl.struct "empty"
 struct empty {};
diff --git a/test/vast/Dialect/HighLevel/struct-b.c b/test/vast/Dialect/HighLevel/struct-b.c
index 4a9ea4de67..055fc9bf6c 100644
--- a/test/vast/Dialect/HighLevel/struct-b.c
+++ b/test/vast/Dialect/HighLevel/struct-b.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 // CHECK: hl.struct "node" : {
 // CHECK:  hl.field "data" : !hl.int
diff --git a/test/vast/Dialect/HighLevel/struct-c.c b/test/vast/Dialect/HighLevel/struct-c.c
index 8bef84e1a7..7597d3ff5c 100644
--- a/test/vast/Dialect/HighLevel/struct-c.c
+++ b/test/vast/Dialect/HighLevel/struct-c.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 // CHECK: hl.struct "[[N:anonymous\[[0-9]+\]]]" : {
 // CHECK:  hl.field "data" : !hl.int
diff --git a/test/vast/Dialect/HighLevel/struct-d.c b/test/vast/Dialect/HighLevel/struct-d.c
index 6f997fadfb..f37063fda5 100644
--- a/test/vast/Dialect/HighLevel/struct-d.c
+++ b/test/vast/Dialect/HighLevel/struct-d.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 // CHECK: hl.type "s"
 
diff --git a/test/vast/Dialect/HighLevel/struct-e.c b/test/vast/Dialect/HighLevel/struct-e.c
index 946900d4ed..d5391f2355 100644
--- a/test/vast/Dialect/HighLevel/struct-e.c
+++ b/test/vast/Dialect/HighLevel/struct-e.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 // CHECK: hl.struct "s" : {
 // CHECK:  hl.field "a" : !hl.int
diff --git a/test/vast/Dialect/HighLevel/struct-f.c b/test/vast/Dialect/HighLevel/struct-f.c
index 2199794edf..a895a058a5 100644
--- a/test/vast/Dialect/HighLevel/struct-f.c
+++ b/test/vast/Dialect/HighLevel/struct-f.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 // CHECK: hl.struct "X"
 struct X {};
diff --git a/test/vast/Dialect/HighLevel/sub-a.c b/test/vast/Dialect/HighLevel/sub-a.c
index c334813db1..362c4e81f5 100644
--- a/test/vast/Dialect/HighLevel/sub-a.c
+++ b/test/vast/Dialect/HighLevel/sub-a.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 void minus(int arg1, int arg2) {
 
diff --git a/test/vast/Dialect/HighLevel/subfloat-a.c b/test/vast/Dialect/HighLevel/subfloat-a.c
index 300df4f92a..189623ef6c 100644
--- a/test/vast/Dialect/HighLevel/subfloat-a.c
+++ b/test/vast/Dialect/HighLevel/subfloat-a.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 void minus(float arg1, float arg2) {
 
diff --git a/test/vast/Dialect/HighLevel/switch-a.c b/test/vast/Dialect/HighLevel/switch-a.c
index 3a23209e56..459ff3cb05 100644
--- a/test/vast/Dialect/HighLevel/switch-a.c
+++ b/test/vast/Dialect/HighLevel/switch-a.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 // CHECK: hl.func @switch_simple ([[A1:%arg[0-9]+]]: !hl.lvalue<!hl.int>) -> !hl.int
 int switch_simple(int num)
diff --git a/test/vast/Dialect/HighLevel/switch-b.c b/test/vast/Dialect/HighLevel/switch-b.cpp
similarity index 79%
rename from test/vast/Dialect/HighLevel/switch-b.c
rename to test/vast/Dialect/HighLevel/switch-b.cpp
index 8832a24863..981c726f45 100644
--- a/test/vast/Dialect/HighLevel/switch-b.c
+++ b/test/vast/Dialect/HighLevel/switch-b.cpp
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -std=c++17 --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -std=c++17 --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl -std=c++17 %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl -std=c++17 %s -o %t && %vast-opt %t | diff -B %t -
 
 // CHECK: hl.func @_Z11switch_initi ([[A1:%arg[0-9]+]]: !hl.lvalue<!hl.int>) -> !hl.int
 int switch_init(int num)
diff --git a/test/vast/Dialect/HighLevel/ternary-a.c b/test/vast/Dialect/HighLevel/ternary-a.c
index d27f1c2366..a6222afc75 100644
--- a/test/vast/Dialect/HighLevel/ternary-a.c
+++ b/test/vast/Dialect/HighLevel/ternary-a.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 typedef int INT;
 typedef INT INT2;
 
diff --git a/test/vast/Dialect/HighLevel/typedef-a.c b/test/vast/Dialect/HighLevel/typedef-a.c
index 5f08ea4830..5ad1d68ba9 100644
--- a/test/vast/Dialect/HighLevel/typedef-a.c
+++ b/test/vast/Dialect/HighLevel/typedef-a.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 // CHECK: hl.typedef "INT" : !hl.int
 // CHECK: hl.typedef "SHORT" : !hl.short
diff --git a/test/vast/Dialect/HighLevel/typedef-b.c b/test/vast/Dialect/HighLevel/typedef-b.c
index 837342676b..058039c173 100644
--- a/test/vast/Dialect/HighLevel/typedef-b.c
+++ b/test/vast/Dialect/HighLevel/typedef-b.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 // CHECK: hl.typedef "INT" : !hl.int
 // CHECK: hl.typedef "INT2" : !hl.long
diff --git a/test/vast/Dialect/HighLevel/typedef-c.c b/test/vast/Dialect/HighLevel/typedef-c.c
index 3bcb413f98..9bb7d24d71 100644
--- a/test/vast/Dialect/HighLevel/typedef-c.c
+++ b/test/vast/Dialect/HighLevel/typedef-c.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 // CHECK: hl.typedef "INT" : !hl.int
 typedef int INT;
diff --git a/test/vast/Dialect/HighLevel/unary-a.cpp b/test/vast/Dialect/HighLevel/unary-a.cpp
index f2447507c7..22bb2c24ea 100644
--- a/test/vast/Dialect/HighLevel/unary-a.cpp
+++ b/test/vast/Dialect/HighLevel/unary-a.cpp
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --from-source %s | %file-check %s
-// RUN: %vast-cc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 // CHECK-LABEL: hl.func @_Z10arithmetici
 void arithmetic(int a)
diff --git a/test/vast/Dialect/HighLevel/unary-b.c b/test/vast/Dialect/HighLevel/unary-b.c
index 4b0fe21643..c3fd2b6fd7 100644
--- a/test/vast/Dialect/HighLevel/unary-b.c
+++ b/test/vast/Dialect/HighLevel/unary-b.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 int main() {
     // CHECK: [[A:%[0-9]+]] = hl.var "a" : !hl.lvalue<!hl.int>
diff --git a/test/vast/Dialect/HighLevel/unary-c.c b/test/vast/Dialect/HighLevel/unary-c.c
index bcd127e169..a1dfdb8992 100644
--- a/test/vast/Dialect/HighLevel/unary-c.c
+++ b/test/vast/Dialect/HighLevel/unary-c.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 // CHECK-LABEL: hl.func @logical
 void logical(unsigned long a)
diff --git a/test/vast/Dialect/HighLevel/unary-d.cpp b/test/vast/Dialect/HighLevel/unary-d.cpp
index 84d4478d99..b3d5675635 100644
--- a/test/vast/Dialect/HighLevel/unary-d.cpp
+++ b/test/vast/Dialect/HighLevel/unary-d.cpp
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --from-source %s | %file-check %s
-// RUN: %vast-cc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 // CHECK-LABEL: hl.func @_Z7logicalm
 void logical(unsigned long a)
diff --git a/test/vast/Dialect/HighLevel/union-a.c b/test/vast/Dialect/HighLevel/union-a.c
index 31037148db..94330238a6 100644
--- a/test/vast/Dialect/HighLevel/union-a.c
+++ b/test/vast/Dialect/HighLevel/union-a.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 // CHECK: hl.union "u" : {
 // CHECK:   hl.field "u32" : !hl.int< unsigned >
diff --git a/test/vast/Dialect/HighLevel/union-b.c b/test/vast/Dialect/HighLevel/union-b.c
index 6845a02711..498fa2ba7a 100644
--- a/test/vast/Dialect/HighLevel/union-b.c
+++ b/test/vast/Dialect/HighLevel/union-b.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --ccopts -std=c11 --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --ccopts -std=c11 --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl -std=c11 %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl -std=c11 %s -o %t && %vast-opt %t | diff -B %t -
 
 // CHECK: hl.struct "v"
 struct v {
diff --git a/test/vast/Dialect/HighLevel/vars-a.c b/test/vast/Dialect/HighLevel/vars-a.c
index 4337bd693e..d9edd2d548 100644
--- a/test/vast/Dialect/HighLevel/vars-a.c
+++ b/test/vast/Dialect/HighLevel/vars-a.c
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %file-check %s
-// RUN: %vast-cc --ccopts -xc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 // CHECK-LABEL: hl.func @main () -> !hl.int
 int main()
diff --git a/test/vast/Dialect/HighLevel/while-a.cpp b/test/vast/Dialect/HighLevel/while-a.cpp
index 9e8a301e55..6c18d80dce 100644
--- a/test/vast/Dialect/HighLevel/while-a.cpp
+++ b/test/vast/Dialect/HighLevel/while-a.cpp
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --from-source %s | %file-check %s
-// RUN: %vast-cc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 // CHECK-LABEL: hl.func @_Z11while_emptyv
 void while_empty()
diff --git a/test/vast/Dialect/HighLevel/while-b.cpp b/test/vast/Dialect/HighLevel/while-b.cpp
index a9cc5dff3c..871f0f3138 100644
--- a/test/vast/Dialect/HighLevel/while-b.cpp
+++ b/test/vast/Dialect/HighLevel/while-b.cpp
@@ -1,5 +1,5 @@
-// RUN: %vast-cc --from-source %s | %file-check %s
-// RUN: %vast-cc --from-source %s > %t && %vast-opt %t | diff -B %t -
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
 // CHECK-LABEL: hl.func @_Z11while_breakv
 void while_break()
diff --git a/test/vast/Transform/FromHL/LowerTypes/array-a.c b/test/vast/Transform/FromHL/LowerTypes/array-a.c
index e95f0b6352..0f12ccd27d 100644
--- a/test/vast/Transform/FromHL/LowerTypes/array-a.c
+++ b/test/vast/Transform/FromHL/LowerTypes/array-a.c
@@ -1,4 +1,4 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %vast-opt --vast-hl-lower-types | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %vast-opt --vast-hl-lower-types | %file-check %s
 
 // CHECK: hl.var "ai" : !hl.lvalue<memref<10xsi32>>
 int ai[10];
diff --git a/test/vast/Transform/FromHL/LowerTypes/array-b.c b/test/vast/Transform/FromHL/LowerTypes/array-b.c
index f022d6471a..6e38031366 100644
--- a/test/vast/Transform/FromHL/LowerTypes/array-b.c
+++ b/test/vast/Transform/FromHL/LowerTypes/array-b.c
@@ -1,4 +1,4 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %vast-opt --vast-hl-lower-types | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %vast-opt --vast-hl-lower-types | %file-check %s
 
 // CHECK: hl.var "a" sc_extern : !hl.lvalue<memref<?xsi32>>
 extern int a[];
diff --git a/test/vast/Transform/FromHL/LowerTypes/calls-a.c b/test/vast/Transform/FromHL/LowerTypes/calls-a.c
index cb06e4637d..ec7f263d98 100644
--- a/test/vast/Transform/FromHL/LowerTypes/calls-a.c
+++ b/test/vast/Transform/FromHL/LowerTypes/calls-a.c
@@ -1,4 +1,4 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %vast-opt --vast-hl-lower-types | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %vast-opt --vast-hl-lower-types | %file-check %s
 
 int constant() { return 7; }
 
diff --git a/test/vast/Transform/FromHL/LowerTypes/loop.c b/test/vast/Transform/FromHL/LowerTypes/loop.c
index e9bfe1de2b..4114839cd3 100644
--- a/test/vast/Transform/FromHL/LowerTypes/loop.c
+++ b/test/vast/Transform/FromHL/LowerTypes/loop.c
@@ -1,4 +1,4 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %vast-opt --vast-hl-lower-types | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %vast-opt --vast-hl-lower-types | %file-check %s
 
 void loop_simple()
 {
diff --git a/test/vast/Transform/FromHL/LowerTypes/scope-a.c b/test/vast/Transform/FromHL/LowerTypes/scope-a.c
index 48329f4187..b09b80f8c6 100644
--- a/test/vast/Transform/FromHL/LowerTypes/scope-a.c
+++ b/test/vast/Transform/FromHL/LowerTypes/scope-a.c
@@ -1,4 +1,4 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %vast-opt --vast-hl-lower-types | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %vast-opt --vast-hl-lower-types | %file-check %s
 
 // CHECK: hl.func @test1 () -> si32
 int test1()
diff --git a/test/vast/Transform/FromHL/LowerTypes/strlit-a.c b/test/vast/Transform/FromHL/LowerTypes/strlit-a.c
index 34f9e47ce3..939e93f8e8 100644
--- a/test/vast/Transform/FromHL/LowerTypes/strlit-a.c
+++ b/test/vast/Transform/FromHL/LowerTypes/strlit-a.c
@@ -1,4 +1,4 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %vast-opt --vast-hl-lower-types | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %vast-opt --vast-hl-lower-types | %file-check %s
 
 // CHECK-LABEL: hl.func @main () -> si32
 int main()
diff --git a/test/vast/Transform/FromHL/LowerTypes/struct-access-a.c b/test/vast/Transform/FromHL/LowerTypes/struct-access-a.c
index 4f9208b956..61621ab0f0 100644
--- a/test/vast/Transform/FromHL/LowerTypes/struct-access-a.c
+++ b/test/vast/Transform/FromHL/LowerTypes/struct-access-a.c
@@ -1,4 +1,4 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %vast-opt --vast-hl-lower-types | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %vast-opt --vast-hl-lower-types | %file-check %s
 
 // CHECK:  hl.struct "X" : {
 // CHECK:    hl.field "member_x" : si32
diff --git a/test/vast/Transform/FromHL/LowerTypes/vars-a.cpp b/test/vast/Transform/FromHL/LowerTypes/vars-a.cpp
index 6bd4efe9fc..38eba90897 100644
--- a/test/vast/Transform/FromHL/LowerTypes/vars-a.cpp
+++ b/test/vast/Transform/FromHL/LowerTypes/vars-a.cpp
@@ -1,4 +1,4 @@
-// RUN: %vast-cc --from-source %s | %vast-opt --vast-hl-lower-types | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %vast-opt --vast-hl-lower-types | %file-check %s
 
 // CHECK-LABEL: hl.func @main () -> si32
 int main()
diff --git a/test/vast/Transform/FromHL/LowerTypes/vars-b.cpp b/test/vast/Transform/FromHL/LowerTypes/vars-b.cpp
index 6932d15354..31b564dbe2 100644
--- a/test/vast/Transform/FromHL/LowerTypes/vars-b.cpp
+++ b/test/vast/Transform/FromHL/LowerTypes/vars-b.cpp
@@ -1,4 +1,4 @@
-// RUN: %vast-cc --from-source %s | %vast-opt --vast-hl-lower-types | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %vast-opt --vast-hl-lower-types | %file-check %s
 
 // CHECK-LABEL: hl.func @main () -> si32
 int main()
diff --git a/test/vast/Transform/FromHL/LowerTypes/vars-c.c b/test/vast/Transform/FromHL/LowerTypes/vars-c.c
index b3c9d60dcb..3bf7e01f68 100644
--- a/test/vast/Transform/FromHL/LowerTypes/vars-c.c
+++ b/test/vast/Transform/FromHL/LowerTypes/vars-c.c
@@ -1,4 +1,4 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %vast-opt --vast-hl-lower-types | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %vast-opt --vast-hl-lower-types | %file-check %s
 
 // CHECK-LABEL: hl.func @main () -> si32
 int main()
diff --git a/test/vast/Transform/FromHL/StructsToLLVM/empty-a.c b/test/vast/Transform/FromHL/StructsToLLVM/empty-a.c
index 1262d7c6a5..1dddd49bf9 100644
--- a/test/vast/Transform/FromHL/StructsToLLVM/empty-a.c
+++ b/test/vast/Transform/FromHL/StructsToLLVM/empty-a.c
@@ -1,4 +1,4 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %vast-opt --vast-hl-lower-types --vast-hl-structs-to-llvm | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %vast-opt --vast-hl-lower-types --vast-hl-structs-to-llvm | %file-check %s
 
 // CHECK: hl.typedef "X" : !llvm.struct<"X", ()>
 struct X {};
diff --git a/test/vast/Transform/FromHL/StructsToLLVM/struct-a.c b/test/vast/Transform/FromHL/StructsToLLVM/struct-a.c
index 6bd5d5aafb..2852ea44a9 100644
--- a/test/vast/Transform/FromHL/StructsToLLVM/struct-a.c
+++ b/test/vast/Transform/FromHL/StructsToLLVM/struct-a.c
@@ -1,4 +1,4 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %vast-opt --vast-hl-lower-types --vast-hl-structs-to-llvm | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %vast-opt --vast-hl-lower-types --vast-hl-structs-to-llvm | %file-check %s
 
 // CHECK: hl.typedef "X" : !llvm.struct<"X", (i32)>
 struct X { int x; };
diff --git a/test/vast/Transform/FromHL/StructsToLLVM/struct-b.c b/test/vast/Transform/FromHL/StructsToLLVM/struct-b.c
index 9c6b16602c..ef500ac144 100644
--- a/test/vast/Transform/FromHL/StructsToLLVM/struct-b.c
+++ b/test/vast/Transform/FromHL/StructsToLLVM/struct-b.c
@@ -1,4 +1,4 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %vast-opt --vast-hl-lower-types --vast-hl-structs-to-llvm | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %vast-opt --vast-hl-lower-types --vast-hl-structs-to-llvm | %file-check %s
 
 // CHECK: hl.type "Y"
 struct Y;
diff --git a/test/vast/Transform/FromHL/StructsToLLVM/struct-c.c b/test/vast/Transform/FromHL/StructsToLLVM/struct-c.c
index 052ee38d35..90932f44e0 100644
--- a/test/vast/Transform/FromHL/StructsToLLVM/struct-c.c
+++ b/test/vast/Transform/FromHL/StructsToLLVM/struct-c.c
@@ -1,4 +1,4 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %vast-opt --vast-hl-lower-types --vast-hl-structs-to-llvm | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %vast-opt --vast-hl-lower-types --vast-hl-structs-to-llvm | %file-check %s
 
 struct Y;
 
diff --git a/test/vast/Transform/FromHL/StructsToLLVM/struct-d.c b/test/vast/Transform/FromHL/StructsToLLVM/struct-d.c
index 272960b0d0..d30432d3d3 100644
--- a/test/vast/Transform/FromHL/StructsToLLVM/struct-d.c
+++ b/test/vast/Transform/FromHL/StructsToLLVM/struct-d.c
@@ -1,4 +1,4 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %vast-opt --vast-hl-lower-types --vast-hl-structs-to-llvm | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %vast-opt --vast-hl-lower-types --vast-hl-structs-to-llvm | %file-check %s
 
 // CHECK: hl.typedef "X" : !llvm.struct<"X", (i32, ptr<struct<"X">>)>
 struct X { int a; struct X *x; };
diff --git a/test/vast/Transform/FromHL/ToLLGEPs/member-access-a.c b/test/vast/Transform/FromHL/ToLLGEPs/member-access-a.c
index a796c66f67..72a3d508da 100644
--- a/test/vast/Transform/FromHL/ToLLGEPs/member-access-a.c
+++ b/test/vast/Transform/FromHL/ToLLGEPs/member-access-a.c
@@ -1,4 +1,4 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %vast-opt --vast-hl-lower-types --vast-hl-to-ll-geps | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %vast-opt --vast-hl-lower-types --vast-hl-to-ll-geps | %file-check %s
 
 struct X { int a; };
 
diff --git a/test/vast/Transform/HL/DCE/for-a.c b/test/vast/Transform/HL/DCE/for-a.c
index c7507aab53..3099160631 100644
--- a/test/vast/Transform/HL/DCE/for-a.c
+++ b/test/vast/Transform/HL/DCE/for-a.c
@@ -1,4 +1,4 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %vast-opt --vast-hl-dce | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %vast-opt --vast-hl-dce | %file-check %s
 
 void fn()
 {
diff --git a/test/vast/Transform/HL/DCE/for-b.c b/test/vast/Transform/HL/DCE/for-b.c
index eb18c23901..6b32877905 100644
--- a/test/vast/Transform/HL/DCE/for-b.c
+++ b/test/vast/Transform/HL/DCE/for-b.c
@@ -1,4 +1,4 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %vast-opt --vast-hl-dce | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %vast-opt --vast-hl-dce | %file-check %s
 
 void fn()
 {
@@ -9,7 +9,7 @@ void fn()
         // CHECK-NEXT:   }
         // CHECK-NEXT:   hl.continue
         // CHECK-NEXT: }
-        // CHECK-NEXT: hl.const
+        // CHECK: hl.const
         // CHECK-NEXT: core.implicit.return
         if (i == 5)
         {
diff --git a/test/vast/Transform/HL/DCE/if-a.c b/test/vast/Transform/HL/DCE/if-a.c
index afeee6d27c..5d153e270d 100644
--- a/test/vast/Transform/HL/DCE/if-a.c
+++ b/test/vast/Transform/HL/DCE/if-a.c
@@ -1,4 +1,4 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %vast-opt --vast-hl-dce | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %vast-opt --vast-hl-dce | %file-check %s
 // REQUIRES: return
 
 void fn()
diff --git a/test/vast/Transform/HL/ResolveTypedefs/func-a.c b/test/vast/Transform/HL/ResolveTypedefs/func-a.c
index 355ac9689e..673dfcb790 100644
--- a/test/vast/Transform/HL/ResolveTypedefs/func-a.c
+++ b/test/vast/Transform/HL/ResolveTypedefs/func-a.c
@@ -1,4 +1,4 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %vast-opt --vast-hl-dce --vast-hl-lower-types --vast-hl-lower-typedefs | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %vast-opt --vast-hl-dce --vast-hl-lower-types --vast-hl-lower-typedefs | %file-check %s
 
 typedef int INT;
 
diff --git a/test/vast/Transform/HL/ResolveTypedefs/struct-a.c b/test/vast/Transform/HL/ResolveTypedefs/struct-a.c
index c91cdc0626..9a637e84ad 100644
--- a/test/vast/Transform/HL/ResolveTypedefs/struct-a.c
+++ b/test/vast/Transform/HL/ResolveTypedefs/struct-a.c
@@ -1,4 +1,4 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %vast-opt --vast-hl-dce --vast-hl-lower-types --vast-hl-lower-typedefs | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %vast-opt --vast-hl-dce --vast-hl-lower-types --vast-hl-lower-typedefs | %file-check %s
 
 typedef int INT;
 
diff --git a/test/vast/Transform/HL/ResolveTypedefs/var-a.c b/test/vast/Transform/HL/ResolveTypedefs/var-a.c
index de952287bb..78fb0f31fd 100644
--- a/test/vast/Transform/HL/ResolveTypedefs/var-a.c
+++ b/test/vast/Transform/HL/ResolveTypedefs/var-a.c
@@ -1,4 +1,4 @@
-// RUN: %vast-cc --ccopts -xc --from-source %s | %vast-opt --vast-hl-dce --vast-hl-lower-types --vast-hl-lower-typedefs | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %vast-opt --vast-hl-dce --vast-hl-lower-types --vast-hl-lower-typedefs | %file-check %s
 
 typedef int INT;