4 files changed, 82 insertions, 0 deletions
diff --git a/test/lit/help/wasm-opt.test b/test/lit/help/wasm-opt.test
index 8e04a756c..186382fd4 100644
--- a/test/lit/help/wasm-opt.test
+++ b/test/lit/help/wasm-opt.test
@@ -567,6 +567,8 @@
 ;; CHECK-NEXT:   --zero-filled-memory,-uim                     Assume that an imported memory
 ;; CHECK-NEXT:                                                 will be zero-initialized
 ;; CHECK-NEXT:
+;; CHECK-NEXT:   --skip-pass,-sp                               Skip a pass (do not run it)
+;; CHECK-NEXT:
 ;; CHECK-NEXT:
 ;; CHECK-NEXT: Tool options:
 ;; CHECK-NEXT: -------------
diff --git a/test/lit/help/wasm2js.test b/test/lit/help/wasm2js.test
index e023c2af5..501504027 100644
--- a/test/lit/help/wasm2js.test
+++ b/test/lit/help/wasm2js.test
@@ -526,6 +526,8 @@
 ;; CHECK-NEXT:   --zero-filled-memory,-uim                     Assume that an imported memory
 ;; CHECK-NEXT:                                                 will be zero-initialized
 ;; CHECK-NEXT:
+;; CHECK-NEXT:   --skip-pass,-sp                               Skip a pass (do not run it)
+;; CHECK-NEXT:
 ;; CHECK-NEXT:
 ;; CHECK-NEXT: Tool options:
 ;; CHECK-NEXT: -------------
diff --git a/test/lit/passes/O1_skip.wast b/test/lit/passes/O1_skip.wast
new file mode 100644
index 000000000..c57d052b4
--- /dev/null
+++ b/test/lit/passes/O1_skip.wast
@@ -0,0 +1,70 @@
+;; NOTE: Assertions have been generated by update_lit_checks.py --all-items and should not be edited.
+;; NOTE: This test was ported using port_passes_tests_to_lit.py and could be cleaned up.
+
+;; RUN: foreach %s %t wasm-opt -O2 --coalesce-locals --skip-pass=coalesce-locals -S -o - | filecheck %s
+
+;; We should skip coalese-locals even though it is run in -O2 and also we ask to
+;; run it directly: the skip instruction overrides everything else.
+
+(module
+ ;; CHECK:      (type $i32_i32_=>_none (func (param i32 i32)))
+
+ ;; CHECK:      (type $i32_=>_none (func (param i32)))
+
+ ;; CHECK:      (import "a" "b" (func $log (param i32 i32)))
+ (import "a" "b" (func $log (param i32 i32)))
+
+ (func "foo" (param $p i32)
+  ;; The locals $x and $y can be coalesced into a single local, but as we do not
+  ;; run that pass, they will not be. Other minor optimizations will occur here,
+  ;; such as using a tee.
+  (local $x i32)
+  (local $y i32)
+
+  (local.set $x
+   (i32.add
+    (local.get $p)
+    (i32.const 1)
+   )
+  )
+  (call $log
+   (local.get $x)
+   (local.get $x)
+  )
+
+  (local.set $y
+   (i32.add
+    (local.get $p)
+    (i32.const 1)
+   )
+  )
+  (call $log
+   (local.get $y)
+   (local.get $y)
+  )
+ )
+)
+;; CHECK:      (export "foo" (func $0))
+
+;; CHECK:      (func $0 (; has Stack IR ;) (param $p i32)
+;; CHECK-NEXT:  (local $x i32)
+;; CHECK-NEXT:  (local $y i32)
+;; CHECK-NEXT:  (call $log
+;; CHECK-NEXT:   (local.tee $x
+;; CHECK-NEXT:    (i32.add
+;; CHECK-NEXT:     (local.get $p)
+;; CHECK-NEXT:     (i32.const 1)
+;; CHECK-NEXT:    )
+;; CHECK-NEXT:   )
+;; CHECK-NEXT:   (local.get $x)
+;; CHECK-NEXT:  )
+;; CHECK-NEXT:  (call $log
+;; CHECK-NEXT:   (local.tee $y
+;; CHECK-NEXT:    (i32.add
+;; CHECK-NEXT:     (local.get $p)
+;; CHECK-NEXT:     (i32.const 1)
+;; CHECK-NEXT:    )
+;; CHECK-NEXT:   )
+;; CHECK-NEXT:   (local.get $y)
+;; CHECK-NEXT:  )
+;; CHECK-NEXT: )
diff --git a/test/lit/passes/skip-missing.wast b/test/lit/passes/skip-missing.wast
new file mode 100644
index 000000000..02778dab0
--- /dev/null
+++ b/test/lit/passes/skip-missing.wast
@@ -0,0 +1,8 @@
+;; We should warn on a pass called "waka" not having been run and skipped.
+
+;; RUN: wasm-opt %s -O1 --skip-pass=waka 2>&1 | filecheck %s
+
+;; CHECK: warning: --waka was requested to be skipped, but it was not found in the passes that were run.
+
+(module
+)