diff --git a/mlir/test/CAPI/execution_engine.c b/mlir/test/CAPI/execution_engine.c
index 4751288c3ee4b..79ee2c68d9b21 100644
--- a/mlir/test/CAPI/execution_engine.c
+++ b/mlir/test/CAPI/execution_engine.c
@@ -7,6 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+// UNSUPPORTED: target=riscv64{{.*}}
 /* RUN: mlir-capi-execution-engine-test 2>&1 | FileCheck %s
  */
 /* REQUIRES: host-supports-jit
diff --git a/mlir/test/mlir-runner/async-func.mlir b/mlir/test/mlir-runner/async-func.mlir
index 90c865add22e7..0cfc3851ad4c0 100644
--- a/mlir/test/mlir-runner/async-func.mlir
+++ b/mlir/test/mlir-runner/async-func.mlir
@@ -1,3 +1,5 @@
+// UNSUPPORTED: target=riscv64{{.*}}
+
 // RUN:   mlir-opt %s -pass-pipeline="builtin.module(async-func-to-async-runtime,async-to-async-runtime,func.func(async-runtime-ref-counting,async-runtime-ref-counting-opt),convert-async-to-llvm,test-lower-to-llvm)" \
 // RUN: | mlir-runner                                                      \
 // RUN:     -e main -entry-point-result=void -O0                               \
diff --git a/mlir/test/mlir-runner/async-value.mlir b/mlir/test/mlir-runner/async-value.mlir
index d5251a9a9b552..a1a81573f8d6e 100644
--- a/mlir/test/mlir-runner/async-value.mlir
+++ b/mlir/test/mlir-runner/async-value.mlir
@@ -1,3 +1,5 @@
+// UNSUPPORTED: target=riscv64{{.*}}
+
 // RUN:   mlir-opt %s -pass-pipeline="builtin.module(async-to-async-runtime,func.func(async-runtime-ref-counting,async-runtime-ref-counting-opt),convert-async-to-llvm,func.func(convert-arith-to-llvm),convert-vector-to-llvm,finalize-memref-to-llvm,convert-func-to-llvm,convert-cf-to-llvm,reconcile-unrealized-casts)" \
 // RUN: | mlir-runner                                                      \
 // RUN:     -e main -entry-point-result=void -O0                               \
diff --git a/mlir/test/mlir-runner/bare-ptr-call-conv.mlir b/mlir/test/mlir-runner/bare-ptr-call-conv.mlir
index d08c96a6fa541..e33ac78637097 100644
--- a/mlir/test/mlir-runner/bare-ptr-call-conv.mlir
+++ b/mlir/test/mlir-runner/bare-ptr-call-conv.mlir
@@ -1,3 +1,5 @@
+// UNSUPPORTED: target=riscv64{{.*}}
+
 // RUN: mlir-opt %s -pass-pipeline="builtin.module(func.func(convert-scf-to-cf,convert-arith-to-llvm),finalize-memref-to-llvm,convert-func-to-llvm{use-bare-ptr-memref-call-conv=1},convert-cf-to-llvm,reconcile-unrealized-casts)" | mlir-runner -shared-libs=%mlir_c_runner_utils -entry-point-result=void | FileCheck %s
 
 // Verify bare pointer memref calling convention. `simple_add1_add2_test`
diff --git a/mlir/test/mlir-runner/copy.mlir b/mlir/test/mlir-runner/copy.mlir
index 49d1b4420349c..c74ea0a27288b 100644
--- a/mlir/test/mlir-runner/copy.mlir
+++ b/mlir/test/mlir-runner/copy.mlir
@@ -1,3 +1,5 @@
+// UNSUPPORTED: target=riscv64{{.*}}
+
 // RUN: mlir-opt %s -pass-pipeline="builtin.module(func.func(convert-scf-to-cf,convert-arith-to-llvm),finalize-memref-to-llvm,convert-func-to-llvm,convert-cf-to-llvm,reconcile-unrealized-casts)" \
 // RUN: | mlir-runner -e main -entry-point-result=void \
 // RUN: -shared-libs=%mlir_runner_utils,%mlir_c_runner_utils \
diff --git a/mlir/test/mlir-runner/expand-arith-ops.mlir b/mlir/test/mlir-runner/expand-arith-ops.mlir
index e52225f56617d..1ebabd67521ed 100644
--- a/mlir/test/mlir-runner/expand-arith-ops.mlir
+++ b/mlir/test/mlir-runner/expand-arith-ops.mlir
@@ -1,3 +1,5 @@
+// UNSUPPORTED: target=riscv64{{.*}}
+
 // RUN:   mlir-opt %s -pass-pipeline="builtin.module(func.func(arith-expand{include-bf16=true},convert-arith-to-llvm),convert-vector-to-llvm,convert-func-to-llvm,reconcile-unrealized-casts)" \
 // RUN: | mlir-runner                                                      \
 // RUN:     -e main -entry-point-result=void -O0                               \
diff --git a/mlir/test/mlir-runner/global-constructors.mlir b/mlir/test/mlir-runner/global-constructors.mlir
index 8b19d9873b8b0..756bbc9ef37a2 100644
--- a/mlir/test/mlir-runner/global-constructors.mlir
+++ b/mlir/test/mlir-runner/global-constructors.mlir
@@ -1,4 +1,4 @@
-// UNSUPPORTED: target=aarch64{{.*}}, target=arm64{{.*}}
+// UNSUPPORTED: target=aarch64{{.*}}, target=arm64{{.*}}, target=riscv64{{.*}}
 // RUN: mlir-runner %s -e entry -entry-point-result=void  \
 // RUN: -shared-libs=%mlir_c_runner_utils | \
 // RUN: FileCheck %s
diff --git a/mlir/test/mlir-runner/math-polynomial-approx.mlir b/mlir/test/mlir-runner/math-polynomial-approx.mlir
index 6ed03916f1e15..892d08f3a431a 100644
--- a/mlir/test/mlir-runner/math-polynomial-approx.mlir
+++ b/mlir/test/mlir-runner/math-polynomial-approx.mlir
@@ -1,3 +1,4 @@
+// UNSUPPORTED: target=riscv64{{.*}
 // RUN:   mlir-opt %s -pass-pipeline="builtin.module(func.func(test-math-polynomial-approximation),convert-vector-to-scf,convert-scf-to-cf,convert-vector-to-llvm,convert-to-llvm,reconcile-unrealized-casts)" \
 // RUN: | mlir-runner                                                      \
 // RUN:     -e main -entry-point-result=void -O0                               \
diff --git a/mlir/test/mlir-runner/memref-reinterpret-cast.mlir b/mlir/test/mlir-runner/memref-reinterpret-cast.mlir
index e86e2c7e720be..2e4826ad40a77 100644
--- a/mlir/test/mlir-runner/memref-reinterpret-cast.mlir
+++ b/mlir/test/mlir-runner/memref-reinterpret-cast.mlir
@@ -1,3 +1,4 @@
+// UNSUPPORTED: target=riscv64{{.*}
 // RUN: mlir-opt %s -pass-pipeline="builtin.module(func.func(convert-scf-to-cf),finalize-memref-to-llvm,func.func(convert-arith-to-llvm),convert-func-to-llvm,convert-cf-to-llvm,reconcile-unrealized-casts)" \
 // RUN: | mlir-runner -e main -entry-point-result=void \
 // RUN: -shared-libs=%mlir_runner_utils,%mlir_c_runner_utils \
diff --git a/mlir/test/mlir-runner/memref-reshape.mlir b/mlir/test/mlir-runner/memref-reshape.mlir
index 8c17f1fd02358..7260ef46bf909 100644
--- a/mlir/test/mlir-runner/memref-reshape.mlir
+++ b/mlir/test/mlir-runner/memref-reshape.mlir
@@ -1,3 +1,4 @@
+// UNSUPPORTED: target=riscv64{{.*}
 // RUN: mlir-opt %s -pass-pipeline="builtin.module(func.func(convert-scf-to-cf,memref-expand,convert-arith-to-llvm),finalize-memref-to-llvm,convert-func-to-llvm,convert-cf-to-llvm,reconcile-unrealized-casts)" \
 // RUN: | mlir-runner -e main -entry-point-result=void \
 // RUN: -shared-libs=%mlir_runner_utils,%mlir_c_runner_utils \
diff --git a/mlir/test/mlir-runner/sgemm-naive-codegen.mlir b/mlir/test/mlir-runner/sgemm-naive-codegen.mlir
index 0bb2650fff2eb..7224e196fede8 100644
--- a/mlir/test/mlir-runner/sgemm-naive-codegen.mlir
+++ b/mlir/test/mlir-runner/sgemm-naive-codegen.mlir
@@ -1,3 +1,4 @@
+// UNSUPPORTED: target=riscv64{{.*}
 // RUN: mlir-opt -pass-pipeline="builtin.module(func.func(convert-linalg-to-loops,lower-affine,convert-scf-to-cf,convert-arith-to-llvm),convert-vector-to-llvm,finalize-memref-to-llvm,convert-func-to-llvm,convert-cf-to-llvm,reconcile-unrealized-casts)" %s | mlir-runner -O3 -e main -entry-point-result=void -shared-libs=%mlir_c_runner_utils | FileCheck %s
 
 func.func @main() {
diff --git a/mlir/test/mlir-runner/test-expand-math-approx.mlir b/mlir/test/mlir-runner/test-expand-math-approx.mlir
index 3f9d3f2125e1a..e63317f9638dd 100644
--- a/mlir/test/mlir-runner/test-expand-math-approx.mlir
+++ b/mlir/test/mlir-runner/test-expand-math-approx.mlir
@@ -1,3 +1,4 @@
+// UNSUPPORTED: target=riscv64{{.*}
 // RUN:   mlir-opt %s -pass-pipeline="builtin.module(func.func(math-expand-ops),convert-vector-to-scf,convert-scf-to-cf,convert-vector-to-llvm,convert-to-llvm,reconcile-unrealized-casts)" \
 // RUN: | mlir-runner                                                      \
 // RUN:     -e main -entry-point-result=void -O0                               \