Use wat over wast for text format filenames (#2518)

68 files changed, 68 insertions, 269 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c040425a2..b210226fa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -379,10 +379,10 @@ endif()
 enable_testing()
 
 add_test(NAME opt-unit
-         COMMAND bin/wasm-opt test/unit.wast --flatten --ssa --metrics -O4 -Os --metrics)
+         COMMAND bin/wasm-opt test/unit.wat --flatten --ssa --metrics -O4 -Os --metrics)
 add_test(NAME metrics-emcc
          COMMAND bin/wasm-opt test/emcc_hello_world.fromasm --metrics)
 add_test(NAME exec-unit
-         COMMAND bin/wasm-opt test/unit.wast --fuzz-exec)
+         COMMAND bin/wasm-opt test/unit.wat --fuzz-exec)
 add_test(NAME exec-hello
-         COMMAND bin/wasm-opt test/hello_world.wast --fuzz-exec)
+         COMMAND bin/wasm-opt test/hello_world.wat --fuzz-exec)
diff --git a/README.md b/README.md
index 46970fe9c..25251f0a4 100644
--- a/README.md
+++ b/README.md
@@ -226,14 +226,14 @@ passes on it, as well as print it (before and/or after the transformations). For
 example, try
 
 ````
-bin/wasm-opt test/passes/lower-if-else.wast --print
+bin/wasm-opt test/passes/lower-if-else.wat --print
 ````
 
 That will pretty-print out one of the test cases in the test suite. To run a
 transformation pass on it, try
 
 ````
-bin/wasm-opt test/passes/lower-if-else.wast --print --lower-if-else
+bin/wasm-opt test/passes/lower-if-else.wat --print --lower-if-else
 ````
 
 The `lower-if-else` pass lowers if-else into a block and a break. You can see
@@ -262,7 +262,7 @@ This will print out JavaScript to the console.
 For example, try
 
 ```
-$ bin/wasm2js test/hello_world.wast
+$ bin/wasm2js test/hello_world.wat
 ```
 
 That output contains
@@ -289,7 +289,7 @@ as a translation of
 wasm2js's output is in ES6 module format - basically, it converts a wasm
 module into an ES6 module (to run on older browsers and Node.js versions
 you can use Babel etc. to convert it to ES5). Let's look at a full example
-of calling that hello world wast; first, create the main JS file:
+of calling that hello world wat; first, create the main JS file:
 
 ```javascript
 // main.mjs
@@ -301,7 +301,7 @@ The run this (note that you need a new enough Node.js with ES6 module
 support):
 
 ```shell
-$ bin/wasm2js test/hello_world.wast -o hello_world.mjs
+$ bin/wasm2js test/hello_world.wat -o hello_world.mjs
 $ node --experimental-modules main.mjs
 the sum of 1 and 2 is: 3
 ```
diff --git a/auto_update_tests.py b/auto_update_tests.py
index b1f92e3f9..c085cf4b9 100755
--- a/auto_update_tests.py
+++ b/auto_update_tests.py
@@ -73,7 +73,7 @@ def update_asm_js_tests():
 
 def update_wasm_opt_tests():
     print('\n[ checking wasm-opt -o notation... ]\n')
-    wast = os.path.join(shared.options.binaryen_test, 'hello_world.wast')
+    wast = os.path.join(shared.options.binaryen_test, 'hello_world.wat')
     cmd = shared.WASM_OPT + [wast, '-o', 'a.wast', '-S']
     support.run_command(cmd)
     open(wast, 'w').write(open('a.wast').read())
diff --git a/check.py b/check.py
index df5c2c2c4..f0bb04f19 100755
--- a/check.py
+++ b/check.py
@@ -72,19 +72,19 @@ def run_wasm_opt_tests():
     print('\n[ checking wasm-opt -o notation... ]\n')
 
     for extra_args in [[], ['--no-validation']]:
-        wast = os.path.join(shared.options.binaryen_test, 'hello_world.wast')
-        shared.delete_from_orbit('a.wast')
-        out = 'a.wast'
+        wast = os.path.join(shared.options.binaryen_test, 'hello_world.wat')
+        shared.delete_from_orbit('a.wat')
+        out = 'a.wat'
         cmd = shared.WASM_OPT + [wast, '-o', out, '-S'] + extra_args
         support.run_command(cmd)
         shared.fail_if_not_identical_to_file(open(out).read(), wast)
 
     print('\n[ checking wasm-opt binary reading/writing... ]\n')
 
-    shutil.copyfile(os.path.join(shared.options.binaryen_test, 'hello_world.wast'), 'a.wast')
+    shutil.copyfile(os.path.join(shared.options.binaryen_test, 'hello_world.wat'), 'a.wat')
     shared.delete_from_orbit('a.wasm')
     shared.delete_from_orbit('b.wast')
-    support.run_command(shared.WASM_OPT + ['a.wast', '-o', 'a.wasm'])
+    support.run_command(shared.WASM_OPT + ['a.wat', '-o', 'a.wasm'])
     assert open('a.wasm', 'rb').read()[0] == 0, 'we emit binary by default'
     support.run_command(shared.WASM_OPT + ['a.wasm', '-o', 'b.wast', '-S'])
     assert open('b.wast', 'rb').read()[0] != 0, 'we emit text with -S'
@@ -222,9 +222,9 @@ def run_ctor_eval_tests():
     for t in shared.get_tests(shared.get_test_dir('ctor-eval'), ['.wast', '.wasm']):
         print('..', os.path.basename(t))
         ctors = open(t + '.ctors').read().strip()
-        cmd = shared.WASM_CTOR_EVAL + [t, '-o', 'a.wast', '-S', '--ctors', ctors]
+        cmd = shared.WASM_CTOR_EVAL + [t, '-o', 'a.wat', '-S', '--ctors', ctors]
         support.run_command(cmd)
-        actual = open('a.wast').read()
+        actual = open('a.wat').read()
         out = t + '.out'
         shared.fail_if_not_identical_to_file(actual, out)
 
@@ -235,10 +235,10 @@ def run_wasm_metadce_tests():
     for t in shared.get_tests(shared.get_test_dir('metadce'), ['.wast', '.wasm']):
         print('..', os.path.basename(t))
         graph = t + '.graph.txt'
-        cmd = shared.WASM_METADCE + [t, '--graph-file=' + graph, '-o', 'a.wast', '-S', '-all']
+        cmd = shared.WASM_METADCE + [t, '--graph-file=' + graph, '-o', 'a.wat', '-S', '-all']
         stdout = support.run_command(cmd)
         expected = t + '.dced'
-        with open('a.wast') as seen:
+        with open('a.wat') as seen:
             shared.fail_if_not_identical_to_file(seen.read(), expected)
         shared.fail_if_not_identical_to_file(stdout, expected + '.stdout')
 
@@ -257,8 +257,8 @@ def run_wasm_reduce_tests():
         support.run_command(shared.WASM_AS + [t, '-o', 'a.wasm'])
         support.run_command(shared.WASM_REDUCE + ['a.wasm', '--command=%s b.wasm --fuzz-exec -all' % shared.WASM_OPT[0], '-t', 'b.wasm', '-w', 'c.wasm', '--timeout=4'])
         expected = t + '.txt'
-        support.run_command(shared.WASM_DIS + ['c.wasm', '-o', 'a.wast'])
-        with open('a.wast') as seen:
+        support.run_command(shared.WASM_DIS + ['c.wasm', '-o', 'a.wat'])
+        with open('a.wat') as seen:
             shared.fail_if_not_identical_to_file(seen.read(), expected)
 
     # run on a nontrivial fuzz testcase, for general coverage
diff --git a/scripts/embedwast.py b/scripts/embedwat.py
index 804be4211..dfb12b772 100755
--- a/scripts/embedwast.py
+++ b/scripts/embedwat.py
@@ -20,17 +20,17 @@ input_file = sys.argv[1]
 output_file = sys.argv[2]
 
 with open(input_file) as f:
-    wast = f.read()
+    wat = f.read()
 
 output = """\
-// Automatically generated by embedwast.py
+// Automatically generated by embedwat.py
 
 #include "passes/intrinsics-module.h"
 
 static const char theModule[%d] = {
-""" % (len(wast) + 1)
+""" % (len(wat) + 1)
 
-for c in wast:
+for c in wat:
     output += str(ord(c)) + ', '
 
 output += '''0
diff --git a/scripts/fuzz_opt.py b/scripts/fuzz_opt.py
index 9cf3ff44d..a66c599bb 100644
--- a/scripts/fuzz_opt.py
+++ b/scripts/fuzz_opt.py
@@ -536,7 +536,7 @@ if not NANS:
 # possible feature options that are sometimes passed to the tools. this
 # contains the list of all possible feature flags we can disable (after
 # we enable all before that in the constant options)
-POSSIBLE_FEATURE_OPTS = run([in_bin('wasm-opt'), '--print-features', '-all', in_binaryen('test', 'hello_world.wast'), '-all']).replace('--enable', '--disable').strip().split('\n')
+POSSIBLE_FEATURE_OPTS = run([in_bin('wasm-opt'), '--print-features', '-all', in_binaryen('test', 'hello_world.wat'), '-all']).replace('--enable', '--disable').strip().split('\n')
 print('POSSIBLE_FEATURE_OPTS:', POSSIBLE_FEATURE_OPTS)
 
 if __name__ == '__main__':
diff --git a/scripts/test/lld.py b/scripts/test/lld.py
index 46e1023ec..2f2ebbf20 100755
--- a/scripts/test/lld.py
+++ b/scripts/test/lld.py
@@ -32,10 +32,10 @@ def args_for_finalize(filename):
 def test_wasm_emscripten_finalize():
     print('\n[ checking wasm-emscripten-finalize testcases... ]\n')
 
-    for wast_path in shared.get_tests(shared.get_test_dir('lld'), ['.wast']):
-        print('..', wast_path)
-        is_passive = '.passive.' in wast_path
-        mem_file = wast_path + '.mem'
+    for wat_path in shared.get_tests(shared.get_test_dir('lld'), ['.wat']):
+        print('..', wat_path)
+        is_passive = '.passive.' in wat_path
+        mem_file = wat_path + '.mem'
         extension_arg_map = {
             '.out': [],
         }
@@ -44,13 +44,13 @@ def test_wasm_emscripten_finalize():
                 '.mem.out': ['--separate-data-segments', mem_file],
             })
         for ext, ext_args in extension_arg_map.items():
-            expected_file = wast_path + ext
+            expected_file = wat_path + ext
             if ext != '.out' and not os.path.exists(expected_file):
                 continue
 
-            cmd = shared.WASM_EMSCRIPTEN_FINALIZE + [wast_path, '-S'] + \
+            cmd = shared.WASM_EMSCRIPTEN_FINALIZE + [wat_path, '-S'] + \
                 ext_args
-            cmd += args_for_finalize(os.path.basename(wast_path))
+            cmd += args_for_finalize(os.path.basename(wat_path))
             actual = support.run_command(cmd)
 
             if not os.path.exists(expected_file):
@@ -61,7 +61,7 @@ def test_wasm_emscripten_finalize():
             if ext == '.mem.out':
                 with open(mem_file) as mf:
                     mem = mf.read()
-                    shared.fail_if_not_identical_to_file(mem, wast_path +
+                    shared.fail_if_not_identical_to_file(mem, wat_path +
                                                          '.mem.mem')
                 os.remove(mem_file)
 
@@ -69,10 +69,10 @@ def test_wasm_emscripten_finalize():
 def update_lld_tests():
     print('\n[ updatring wasm-emscripten-finalize testcases... ]\n')
 
-    for wast_path in shared.get_tests(shared.get_test_dir('lld'), ['.wast']):
-        print('..', wast_path)
-        is_passive = '.passive.' in wast_path
-        mem_file = wast_path + '.mem'
+    for wat_path in shared.get_tests(shared.get_test_dir('lld'), ['.wat']):
+        print('..', wat_path)
+        is_passive = '.passive.' in wat_path
+        mem_file = wat_path + '.mem'
         extension_arg_map = {
             '.out': [],
         }
@@ -81,12 +81,12 @@ def update_lld_tests():
                 '.mem.out': ['--separate-data-segments', mem_file + '.mem'],
             })
         for ext, ext_args in extension_arg_map.items():
-            out_path = wast_path + ext
+            out_path = wat_path + ext
             if ext != '.out' and not os.path.exists(out_path):
                 continue
-            cmd = shared.WASM_EMSCRIPTEN_FINALIZE + [wast_path, '-S'] + \
+            cmd = shared.WASM_EMSCRIPTEN_FINALIZE + [wat_path, '-S'] + \
                 ext_args
-            cmd += args_for_finalize(os.path.basename(wast_path))
+            cmd += args_for_finalize(os.path.basename(wat_path))
             actual = support.run_command(cmd)
             with open(out_path, 'w') as o:
                 o.write(actual)
diff --git a/src/passes/CMakeLists.txt b/src/passes/CMakeLists.txt
index 9ab735efe..a3dd1c26a 100644
--- a/src/passes/CMakeLists.txt
+++ b/src/passes/CMakeLists.txt
@@ -1,7 +1,7 @@
 add_custom_command(
   OUTPUT WasmIntrinsics.cpp
-  COMMAND python ${PROJECT_SOURCE_DIR}/scripts/embedwast.py ${PROJECT_SOURCE_DIR}/src/passes/wasm-intrinsics.wast ${CMAKE_CURRENT_BINARY_DIR}/WasmIntrinsics.cpp
-  DEPENDS ${PROJECT_SOURCE_DIR}/scripts/embedwast.py wasm-intrinsics.wast)
+  COMMAND python ${PROJECT_SOURCE_DIR}/scripts/embedwat.py ${PROJECT_SOURCE_DIR}/src/passes/wasm-intrinsics.wat ${CMAKE_CURRENT_BINARY_DIR}/WasmIntrinsics.cpp
+  DEPENDS ${PROJECT_SOURCE_DIR}/scripts/embedwat.py wasm-intrinsics.wat)
 
 set(passes_SOURCES
   pass.cpp
diff --git a/src/passes/OptimizeInstructions.wast b/src/passes/OptimizeInstructions.wat
index 5142dc2c6..d690e9365 100644
--- a/src/passes/OptimizeInstructions.wast
+++ b/src/passes/OptimizeInstructions.wat
@@ -1,8 +1,7 @@
-
 ;; This file contains patterns for OptimizeInstructions. Basically, we use a DSL for the patterns,
 ;; and the DSL is just wasm itself, plus some functions with special meanings
 ;;
-;; This file is converted into OptimizeInstructions.wast.processed by
+;; This file is converted into OptimizeInstructions.wat.processed by
 ;;    scripts/process_optimize_instructions.py
 ;; which makes it importable by C++. Then we just #include it there, avoiding the need to ship
 ;; a data file on the side.
@@ -24,4 +23,3 @@
     )
   )
 )
-
diff --git a/src/passes/OptimizeInstructions.wast.processed b/src/passes/OptimizeInstructions.wat.processed
index b69ecdf04..b0be5de36 100644
--- a/src/passes/OptimizeInstructions.wast.processed
+++ b/src/passes/OptimizeInstructions.wat.processed
@@ -1,8 +1,7 @@
-"\n"
 ";; This file contains patterns for OptimizeInstructions. Basically, we use a DSL for the patterns,\n"
 ";; and the DSL is just wasm itself, plus some functions with special meanings\n"
 ";;\n"
-";; This file is converted into OptimizeInstructions.wast.processed by\n"
+";; This file is converted into OptimizeInstructions.wat.processed by\n"
 ";;    scripts/process_optimize_instructions.py\n"
 ";; which makes it importable by C++. Then we just #include it there, avoiding the need to ship\n"
 ";; a data file on the side.\n"
@@ -24,4 +23,3 @@
 ")\n"
 ")\n"
 ")\n"
-"\n"
diff --git a/src/passes/Print.cpp b/src/passes/Print.cpp
index 62161c6b0..2ec92a086 100644
--- a/src/passes/Print.cpp
+++ b/src/passes/Print.cpp
@@ -1798,7 +1798,7 @@ struct PrintSExpression : public OverriddenVisitor<PrintSExpression> {
       }
     }
   }
-  // try-catch-end is written in the folded wast format as
+  // try-catch-end is written in the folded wat format as
   // (try
   //   ...
   //  (catch
diff --git a/src/passes/RemoveNonJSOps.cpp b/src/passes/RemoveNonJSOps.cpp
index a2fe10812..eebd97ae1 100644
--- a/src/passes/RemoveNonJSOps.cpp
+++ b/src/passes/RemoveNonJSOps.cpp
@@ -21,7 +21,7 @@
 // intrinsic implementation. Intrinsics don't use themselves to implement
 // themselves.
 //
-// You'll find a large wast blob in `wasm-intrinsics.wast` next to this file
+// You'll find a large wat blob in `wasm-intrinsics.wat` next to this file
 // which contains all of the injected intrinsics. We manually copy over any
 // needed intrinsics from this module into the module that we're optimizing
 // after walking the current module.
@@ -65,7 +65,7 @@ struct RemoveNonJSOpsPass : public WalkerPass<PostWalker<RemoveNonJSOpsPass>> {
       return;
     }
 
-    // Parse the wast blob we have at the end of this file.
+    // Parse the wat blob we have at the end of this file.
     //
     // TODO: only do this once per invocation of wasm2asm
     Module intrinsicsModule;
diff --git a/src/passes/pass.cpp b/src/passes/pass.cpp
index 906fb85e2..4b3021764 100644
--- a/src/passes/pass.cpp
+++ b/src/passes/pass.cpp
@@ -454,7 +454,7 @@ void PassRunner::addDefaultGlobalOptimizationPostPasses() {
 }
 
 static void dumpWast(Name name, Module* wasm) {
-  // write out the wast
+  // write out the wat
   static int counter = 0;
   std::string numstr = std::to_string(counter++);
   while (numstr.size() < 3) {
diff --git a/src/passes/wasm-intrinsics.wast b/src/passes/wasm-intrinsics.wat
index f54547a0d..f54547a0d 100644
--- a/src/passes/wasm-intrinsics.wast
+++ b/src/passes/wasm-intrinsics.wat
diff --git a/src/tools/wasm-as.cpp b/src/tools/wasm-as.cpp
index cb6a8f226..67a7d6f14 100644
--- a/src/tools/wasm-as.cpp
+++ b/src/tools/wasm-as.cpp
@@ -36,7 +36,7 @@ int main(int argc, const char* argv[]) {
   std::string sourceMapFilename;
   std::string sourceMapUrl;
   ToolOptions options("wasm-as",
-                      "Assemble a .wast (WebAssembly text format) into a .wasm "
+                      "Assemble a .wat (WebAssembly text format) into a .wasm "
                       "(WebAssembly binary format)");
   options.extra["validate"] = "wasm";
   options
@@ -94,7 +94,7 @@ int main(int argc, const char* argv[]) {
   // default output is infile with changed suffix
   if (options.extra.find("output") == options.extra.end()) {
     options.extra["output"] =
-      removeSpecificSuffix(options.extra["infile"], ".wast") + ".wasm";
+      removeSpecificSuffix(options.extra["infile"], ".wat") + ".wasm";
   }
 
   auto input(read_file<std::string>(options.extra["infile"], Flags::Text));
diff --git a/src/tools/wasm-dis.cpp b/src/tools/wasm-dis.cpp
index 493a55566..89925b9cc 100644
--- a/src/tools/wasm-dis.cpp
+++ b/src/tools/wasm-dis.cpp
@@ -31,7 +31,7 @@ int main(int argc, const char* argv[]) {
   std::string sourceMapFilename;
   Options options("wasm-dis",
                   "Un-assemble a .wasm (WebAssembly binary format) into a "
-                  ".wast (WebAssembly text format)");
+                  ".wat (WebAssembly text format)");
   options
     .add("--output",
          "-o",
diff --git a/src/tools/wasm2js.cpp b/src/tools/wasm2js.cpp
index b8e2daa39..7fa56c810 100644
--- a/src/tools/wasm2js.cpp
+++ b/src/tools/wasm2js.cpp
@@ -809,7 +809,7 @@ void AssertionEmitter::emit() {
 int main(int argc, const char* argv[]) {
   Wasm2JSBuilder::Flags flags;
   OptimizationOptions options("wasm2js",
-                              "Transform .wasm/.wast files to asm.js");
+                              "Transform .wasm/.wat files to asm.js");
   options
     .add("--output",
          "-o",
@@ -873,7 +873,7 @@ int main(int argc, const char* argv[]) {
 
   try {
     // If the input filename ends in `.wasm`, then parse it in binary form,
-    // otherwise assume it's a `*.wast` file and go from there.
+    // otherwise assume it's a `*.wat` file and go from there.
     //
     // Note that we're not using the built-in `ModuleReader` which will also do
     // similar logic here because when testing JS files we use the
diff --git a/test/hello_world.wast b/test/hello_world.wat
index 8efc9e227..8efc9e227 100644
--- a/test/hello_world.wast
+++ b/test/hello_world.wat
diff --git a/test/lld/duplicate_imports.wast b/test/lld/duplicate_imports.wat
index db184bcad..db184bcad 100644
--- a/test/lld/duplicate_imports.wast
+++ b/test/lld/duplicate_imports.wat
diff --git a/test/lld/duplicate_imports.wast.out b/test/lld/duplicate_imports.wat.out
index 323365711..323365711 100644
--- a/test/lld/duplicate_imports.wast.out
+++ b/test/lld/duplicate_imports.wat.out
diff --git a/test/lld/em_asm.wast b/test/lld/em_asm.wat
index 84250b6ac..84250b6ac 100644
--- a/test/lld/em_asm.wast
+++ b/test/lld/em_asm.wat
diff --git a/test/lld/em_asm.wast.out b/test/lld/em_asm.wat.out
index c66cdc1cc..c66cdc1cc 100644
--- a/test/lld/em_asm.wast.out
+++ b/test/lld/em_asm.wat.out
diff --git a/test/lld/em_asm_O0.wast b/test/lld/em_asm_O0.wat
index 10511ca67..10511ca67 100644
--- a/test/lld/em_asm_O0.wast
+++ b/test/lld/em_asm_O0.wat
diff --git a/test/lld/em_asm_O0.wast.out b/test/lld/em_asm_O0.wat.out
index 692b3fe6e..692b3fe6e 100644
--- a/test/lld/em_asm_O0.wast.out
+++ b/test/lld/em_asm_O0.wat.out
diff --git a/test/lld/em_asm_main_thread.wast b/test/lld/em_asm_main_thread.wat
index 93735c7a9..0435e9be0 100644
--- a/test/lld/em_asm_main_thread.wast
+++ b/test/lld/em_asm_main_thread.wat
@@ -1,4 +1,4 @@
-(; Copied from em_asm.wast
+(; Copied from em_asm.wat
   s/emscripten_asm_const_int/emscripten_asm_const_int_sync_on_main_thread/g
 ;)
 (module
diff --git a/test/lld/em_asm_main_thread.wast.out b/test/lld/em_asm_main_thread.wat.out
index 2020b172e..2020b172e 100644
--- a/test/lld/em_asm_main_thread.wast.out
+++ b/test/lld/em_asm_main_thread.wat.out
diff --git a/test/lld/em_asm_shared.wast b/test/lld/em_asm_shared.wat
index ba70886ec..ba70886ec 100644
--- a/test/lld/em_asm_shared.wast
+++ b/test/lld/em_asm_shared.wat
diff --git a/test/lld/em_asm_shared.wast.out b/test/lld/em_asm_shared.wat.out
index f3b676f24..f3b676f24 100644
--- a/test/lld/em_asm_shared.wast.out
+++ b/test/lld/em_asm_shared.wat.out
diff --git a/test/lld/em_asm_table.wast b/test/lld/em_asm_table.wat
index c35ebe577..c35ebe577 100644
--- a/test/lld/em_asm_table.wast
+++ b/test/lld/em_asm_table.wat
diff --git a/test/lld/em_asm_table.wast.out b/test/lld/em_asm_table.wat.out
index 48d02d208..48d02d208 100644
--- a/test/lld/em_asm_table.wast.out
+++ b/test/lld/em_asm_table.wat.out
diff --git a/test/lld/em_js_O0.wast b/test/lld/em_js_O0.wat
index 6d64c5b61..6d64c5b61 100644
--- a/test/lld/em_js_O0.wast
+++ b/test/lld/em_js_O0.wat
diff --git a/test/lld/em_js_O0.wast.out b/test/lld/em_js_O0.wat.out
index 6e141975d..6e141975d 100644
--- a/test/lld/em_js_O0.wast.out
+++ b/test/lld/em_js_O0.wat.out
diff --git a/test/lld/hello_world.passive.wast b/test/lld/hello_world.passive.wat
index 27ccb8f90..27ccb8f90 100644
--- a/test/lld/hello_world.passive.wast
+++ b/test/lld/hello_world.passive.wat
diff --git a/test/lld/hello_world.passive.wast.out b/test/lld/hello_world.passive.wat.out
index 6c9fd4ef7..6c9fd4ef7 100644
--- a/test/lld/hello_world.passive.wast.out
+++ b/test/lld/hello_world.passive.wat.out
diff --git a/test/lld/hello_world.wast b/test/lld/hello_world.wat
index f4b32d0fe..f4b32d0fe 100644
--- a/test/lld/hello_world.wast
+++ b/test/lld/hello_world.wat
diff --git a/test/lld/hello_world.wast.out b/test/lld/hello_world.wat.out
index 55bc3a89a..55bc3a89a 100644
--- a/test/lld/hello_world.wast.out
+++ b/test/lld/hello_world.wat.out
diff --git a/test/lld/init.wast b/test/lld/init.wat
index fe3e5b7b2..fe3e5b7b2 100644
--- a/test/lld/init.wast
+++ b/test/lld/init.wat
diff --git a/test/lld/init.wast.out b/test/lld/init.wat.out
index 52eb0dd51..52eb0dd51 100644
--- a/test/lld/init.wast.out
+++ b/test/lld/init.wat.out
diff --git a/test/lld/recursive.wast b/test/lld/recursive.wat
index cd6a4ae86..cd6a4ae86 100644
--- a/test/lld/recursive.wast
+++ b/test/lld/recursive.wat
diff --git a/test/lld/recursive.wast.out b/test/lld/recursive.wat.out
index af4caef45..af4caef45 100644
--- a/test/lld/recursive.wast.out
+++ b/test/lld/recursive.wat.out
diff --git a/test/lld/recursive_safe_stack.wast b/test/lld/recursive_safe_stack.wat
index 67f7f3914..67f7f3914 100644
--- a/test/lld/recursive_safe_stack.wast
+++ b/test/lld/recursive_safe_stack.wat
diff --git a/test/lld/recursive_safe_stack.wast.out b/test/lld/recursive_safe_stack.wat.out
index 7253a28fb..7253a28fb 100644
--- a/test/lld/recursive_safe_stack.wast.out
+++ b/test/lld/recursive_safe_stack.wat.out
diff --git a/test/lld/reserved_func_ptr.wast b/test/lld/reserved_func_ptr.wat
index f979bd2d8..f979bd2d8 100644
--- a/test/lld/reserved_func_ptr.wast
+++ b/test/lld/reserved_func_ptr.wat
diff --git a/test/lld/reserved_func_ptr.wast.out b/test/lld/reserved_func_ptr.wat.out
index fd0d1f4af..fd0d1f4af 100644
--- a/test/lld/reserved_func_ptr.wast.out
+++ b/test/lld/reserved_func_ptr.wat.out
diff --git a/test/lld/shared.wast b/test/lld/shared.wat
index 99b667e42..99b667e42 100644
--- a/test/lld/shared.wast
+++ b/test/lld/shared.wat
diff --git a/test/lld/shared.wast.out b/test/lld/shared.wat.out
index d27672f3a..d27672f3a 100644
--- a/test/lld/shared.wast.out
+++ b/test/lld/shared.wat.out
diff --git a/test/lld/shared_longjmp.wast b/test/lld/shared_longjmp.wat
index 235e1fadf..235e1fadf 100644
--- a/test/lld/shared_longjmp.wast
+++ b/test/lld/shared_longjmp.wat
diff --git a/test/lld/shared_longjmp.wast.out b/test/lld/shared_longjmp.wat.out
index c6bdf1c17..c6bdf1c17 100644
--- a/test/lld/shared_longjmp.wast.out
+++ b/test/lld/shared_longjmp.wat.out
diff --git a/test/lld/standalone-wasm-with-start.wast b/test/lld/standalone-wasm-with-start.wat
index 8767c8efb..8767c8efb 100644
--- a/test/lld/standalone-wasm-with-start.wast
+++ b/test/lld/standalone-wasm-with-start.wat
diff --git a/test/lld/standalone-wasm-with-start.wast.out b/test/lld/standalone-wasm-with-start.wat.out
index 424d2f85e..424d2f85e 100644
--- a/test/lld/standalone-wasm-with-start.wast.out
+++ b/test/lld/standalone-wasm-with-start.wat.out
diff --git a/test/lld/standalone-wasm.wast b/test/lld/standalone-wasm.wat
index 2ccbf3f29..2ccbf3f29 100644
--- a/test/lld/standalone-wasm.wast
+++ b/test/lld/standalone-wasm.wat
diff --git a/test/lld/standalone-wasm.wast.out b/test/lld/standalone-wasm.wat.out
index 5e9fa4c91..5e9fa4c91 100644
--- a/test/lld/standalone-wasm.wast.out
+++ b/test/lld/standalone-wasm.wat.out
diff --git a/test/lld/standalone-wasm2.wast b/test/lld/standalone-wasm2.wat
index f4c7843b6..f4c7843b6 100644
--- a/test/lld/standalone-wasm2.wast
+++ b/test/lld/standalone-wasm2.wat
diff --git a/test/lld/standalone-wasm2.wast.out b/test/lld/standalone-wasm2.wat.out
index fe669b414..fe669b414 100644
--- a/test/lld/standalone-wasm2.wast.out
+++ b/test/lld/standalone-wasm2.wat.out
diff --git a/test/lld/standalone-wasm3.wast b/test/lld/standalone-wasm3.wat
index 45c0bed35..45c0bed35 100644
--- a/test/lld/standalone-wasm3.wast
+++ b/test/lld/standalone-wasm3.wat
diff --git a/test/lld/standalone-wasm3.wast.out b/test/lld/standalone-wasm3.wat.out
index a334d96e4..a334d96e4 100644
--- a/test/lld/standalone-wasm3.wast.out
+++ b/test/lld/standalone-wasm3.wat.out
diff --git a/test/s2wasm_known_binaryen_shell_test_failures.txt b/test/s2wasm_known_binaryen_shell_test_failures.txt
deleted file mode 100644
index 52d495a5d..000000000
--- a/test/s2wasm_known_binaryen_shell_test_failures.txt
+++ /dev/null
@@ -1,197 +0,0 @@
-# [trap final > memory]
-20010915-1.c.s.wast
-20020413-1.c.s.wast
-20021120-3.c.s.wast
-20030221-1.c.s.wast
-20031012-1.c.s.wast
-20041214-1.c.s.wast
-20050502-1.c.s.wast
-20050502-2.c.s.wast
-20070201-1.c.s.wast
-20071030-1.c.s.wast
-20080502-1.c.s.wast
-20121108-1.c.s.wast
-920501-8.c.s.wast
-920501-9.c.s.wast
-920726-1.c.s.wast
-930513-1.c.s.wast
-980605-1.c.s.wast
-990513-1.c.s.wast
-bitfld-5.c.s.wast
-memcpy-1.c.s.wast
-multi-ix.c.s.wast
-pr37573.c.s.wast
-pr43236.c.s.wast
-pr44852.c.s.wast
-pr51933.c.s.wast
-pr54471.c.s.wast
-pr56205.c.s.wast
-pr56866.c.s.wast
-pr56982.c.s.wast
-pr57130.c.s.wast
-stdarg-1.c.s.wast
-stdarg-2.c.s.wast
-string-opt-17.c.s.wast
-struct-ret-1.c.s.wast
-va-arg-2.c.s.wast
-va-arg-5.c.s.wast
-va-arg-6.c.s.wast
-va-arg-9.c.s.wast
-
-# [trap offset > memory]
-complex-7.c.s.wast
-
-# abort called: the tests are self-validating and call abort when they detect a
-# failure.  This may not be binaryen's fault (the toolchain may be emitting bad
-# code) but it could be binaryen's fault.
-920625-1.c.s.wast
-931004-10.c.s.wast
-931004-12.c.s.wast
-931004-14.c.s.wast
-931004-6.c.s.wast
-bitfld-3.c.s.wast
-eeprof-1.c.s.wast
-pr32244-1.c.s.wast
-pr34971.c.s.wast
-pr38151.c.s.wast
-pr44575.c.s.wast
-stdarg-3.c.s.wast
-strct-stdarg-1.c.s.wast
-strct-varg-1.c.s.wast
-va-arg-pack-1.c.s.wast
-
-# callImport: the toolchain needs to properly use libc and a runtime. These
-# aren't binaryen's fault.
-20000910-2.c.s.wast # strchr
-20000914-1.c.s.wast # malloc
-20011024-1.c.s.wast # strcmp
-20020406-1.c.s.wast # malloc
-20021011-1.c.s.wast # strcmp
-20031204-1.c.s.wast # strcmp
-20050218-1.c.s.wast # strlen
-20050826-1.c.s.wast # memset
-20051113-1.c.s.wast # malloc
-20071018-1.c.s.wast # __builtin_malloc
-20071120-1.c.s.wast # __builtin_malloc
-20071202-1.c.s.wast # memcpy
-20081218-1.c.s.wast # memset
-20101011-1.c.s.wast # signal
-921117-1.c.s.wast # strcmp
-941014-2.c.s.wast # malloc
-960215-1.c.s.wast # __addtf3
-960405-1.c.s.wast # __eqtf2
-960521-1.c.s.wast # malloc
-980506-3.c.s.wast # memset
-980707-1.c.s.wast # strcmp
-980709-1.c.s.wast # pow
-990628-1.c.s.wast # malloc
-991112-1.c.s.wast # isprint
-align-2.c.s.wast # __eqtf2
-builtin-bitops-1.c.s.wast # __builtin_clrsb
-complex-5.c.s.wast # __divsc3
-ipa-sra-2.c.s.wast # calloc
-loop-2f.c.s.wast # open
-loop-2g.c.s.wast # open
-memcpy-2.c.s.wast # memset
-memcpy-bi.c.s.wast # memcpy
-memset-1.c.s.wast # memset
-memset-3.c.s.wast # memset
-pr33870-1.c.s.wast # memset
-pr33870.c.s.wast # memset
-pr34456.c.s.wast # qsort
-pr36038.c.s.wast # memcpy
-pr36765.c.s.wast # __builtin_malloc
-pr39228.c.s.wast # __builtin_isinff
-pr41395-1.c.s.wast # malloc
-pr41395-2.c.s.wast # malloc
-pr41463.c.s.wast # malloc
-pr43008.c.s.wast # __builtin_malloc
-pr43784.c.s.wast # memcpy
-pr47237.c.s.wast # __builtin_apply_args
-pr47337.c.s.wast # strcmp
-pr49218.c.s.wast # __fixsfti
-pr53688.c.s.wast # memset
-pr58419.c.s.wast # getpid
-pr59229.c.s.wast # memcpy
-printf-1.c.s.wast # isprint
-printf-chk-1.c.s.wast # vprintf
-regstack-1.c.s.wast # __addtf3
-strcmp-1.c.s.wast # strcmp
-strcpy-1.c.s.wast # memset
-string-opt-5.c.s.wast # strlen
-strlen-1.c.s.wast # strlen
-strncmp-1.c.s.wast # strcmp
-va-arg-10.c.s.wast # strlen
-va-arg-22.c.s.wast # memcpy
-va-arg-21.c.s.wast # malloc
-vprintf-chk-1.c.s.wast # vprintf
-vprintf-1.c.s.wast # vprintf
-fprintf-1.c.s.wast # stdout
-fprintf-chk-1.c.s.wast # stdout
-vfprintf-1.c.s.wast # stdout
-vfprintf-chk-1.c.s.wast # stdout
-
-# Untriaged
-20000112-1.c.s.wast O0
-20001011-1.c.s.wast O0
-20010409-1.c.s.wast O0
-20010605-2.c.s.wast O0
-20010925-1.c.s.wast O0
-20011008-3.c.s.wast O0
-20011121-1.c.s.wast O0
-20021127-1.c.s.wast O0
-20030626-1.c.s.wast O0
-20030626-2.c.s.wast O0
-20030715-1.c.s.wast O0
-20030914-1.c.s.wast O0
-20030914-2.c.s.wast O0
-20031003-1.c.s.wast O0
-20040208-1.c.s.wast O0
-20040223-1.c.s.wast O0
-20040313-1.c.s.wast O0
-20040709-1.c.s.wast O0
-20040709-2.c.s.wast O0
-20041126-1.c.s.wast O0
-20050121-1.c.s.wast O0
-20090113-1.c.s.wast O0
-20111208-1.c.s.wast O0
-20120207-1.c.s.wast O0
-920810-1.c.s.wast O0
-921006-1.c.s.wast O0
-930622-2.c.s.wast O0
-930725-1.c.s.wast O0
-950426-1.c.s.wast O0
-960327-1.c.s.wast O0
-960513-1.c.s.wast O0
-complex-6.c.s.wast O0
-conversion.c.s.wast O0
-mode-dependent-address.c.s.wast O0
-nestfunc-4.c.s.wast O0
-p18298.c.s.wast O0
-pr15262-1.c.s.wast O0
-pr20621-1.c.s.wast O0
-pr22061-1.c.s.wast O0
-pr23135.c.s.wast O0
-pr30778.c.s.wast O0
-pr33142.c.s.wast O0
-pr36321.c.s.wast O0
-pr42614.c.s.wast O0
-pr49644.c.s.wast O0
-pr60062.c.s.wast O0
-string-opt-18.c.s.wast O0
-vla-dealloc-1.c.s.wast O0
-
-20030914-1.c.s.wast O2
-20040409-1.c.s.wast O2
-20040409-2.c.s.wast O2
-20040409-3.c.s.wast O2
-20060412-1.c.s.wast O2
-20100708-1.c.s.wast O2
-920612-1.c.s.wast O2
-920711-1.c.s.wast O2
-930529-1.c.s.wast O2
-bcp-1.c.s.wast O2
-builtin-constant.c.s.wast O2
-pr22493-1.c.s.wast O2
-# pr28982b.c.s.wast O2
-pr36093.c.s.wast O2
diff --git a/test/unit.wast b/test/unit.wat
index 6d15b26d1..6d15b26d1 100644
--- a/test/unit.wast
+++ b/test/unit.wat
diff --git a/test/unit/input/asyncify-coroutine.wast b/test/unit/input/asyncify-coroutine.wat
index ace97c6e6..ace97c6e6 100644
--- a/test/unit/input/asyncify-coroutine.wast
+++ b/test/unit/input/asyncify-coroutine.wat
diff --git a/test/unit/input/asyncify-pure.wast b/test/unit/input/asyncify-pure.wat
index 961ab9442..961ab9442 100644
--- a/test/unit/input/asyncify-pure.wast
+++ b/test/unit/input/asyncify-pure.wat
diff --git a/test/unit/input/asyncify-sleep.wast b/test/unit/input/asyncify-sleep.wat
index 91fb5a327..91fb5a327 100644
--- a/test/unit/input/asyncify-sleep.wast
+++ b/test/unit/input/asyncify-sleep.wat
diff --git a/test/unit/input/asyncify-stackOverflow.wast b/test/unit/input/asyncify-stackOverflow.wat
index a36a06b40..a36a06b40 100644
--- a/test/unit/input/asyncify-stackOverflow.wast
+++ b/test/unit/input/asyncify-stackOverflow.wat
diff --git a/test/unit/input/em_asm_mangled_string.wast b/test/unit/input/em_asm_mangled_string.wat
index aa856270d..aa856270d 100644
--- a/test/unit/input/em_asm_mangled_string.wast
+++ b/test/unit/input/em_asm_mangled_string.wat
diff --git a/test/unit/input/stack_ir.wast b/test/unit/input/stack_ir.wat
index 0d5d0dfc3..0d5d0dfc3 100644
--- a/test/unit/input/stack_ir.wast
+++ b/test/unit/input/stack_ir.wat
diff --git a/test/unit/test_asyncify.py b/test/unit/test_asyncify.py
index 800f86ed7..356a4935a 100644
--- a/test/unit/test_asyncify.py
+++ b/test/unit/test_asyncify.py
@@ -10,9 +10,9 @@ class AsyncifyTest(utils.BinaryenTestCase):
     def test_asyncify_js(self):
         def test(args):
             print(args)
-            shared.run_process(shared.WASM_OPT + args + [self.input_path('asyncify-sleep.wast'), '--asyncify', '-o', 'a.wasm'])
-            shared.run_process(shared.WASM_OPT + args + [self.input_path('asyncify-coroutine.wast'), '--asyncify', '-o', 'b.wasm'])
-            shared.run_process(shared.WASM_OPT + args + [self.input_path('asyncify-stackOverflow.wast'), '--asyncify', '-o', 'c.wasm'])
+            shared.run_process(shared.WASM_OPT + args + [self.input_path('asyncify-sleep.wat'), '--asyncify', '-o', 'a.wasm'])
+            shared.run_process(shared.WASM_OPT + args + [self.input_path('asyncify-coroutine.wat'), '--asyncify', '-o', 'b.wasm'])
+            shared.run_process(shared.WASM_OPT + args + [self.input_path('asyncify-stackOverflow.wat'), '--asyncify', '-o', 'c.wasm'])
             print('  file size: %d' % os.path.getsize('a.wasm'))
             shared.run_process([shared.NODEJS, self.input_path('asyncify.js')])
 
@@ -24,9 +24,9 @@ class AsyncifyTest(utils.BinaryenTestCase):
         test(['-Os', '-g'])
 
     def test_asyncify_pure_wasm(self):
-        shared.run_process(shared.WASM_OPT + [self.input_path('asyncify-pure.wast'), '--asyncify', '-o', 'a.wasm'])
-        shared.run_process(shared.WASM_DIS + ['a.wasm', '-o', 'a.wast'])
-        output = shared.run_process(shared.WASM_SHELL + ['a.wast'], capture_output=True).stdout
+        shared.run_process(shared.WASM_OPT + [self.input_path('asyncify-pure.wat'), '--asyncify', '-o', 'a.wasm'])
+        shared.run_process(shared.WASM_DIS + ['a.wasm', '-o', 'a.wat'])
+        output = shared.run_process(shared.WASM_SHELL + ['a.wat'], capture_output=True).stdout
         with open(self.input_path('asyncify-pure.txt'), 'r') as f:
             self.assertEqual(f.read(), output)
 
@@ -45,7 +45,7 @@ class AsyncifyTest(utils.BinaryenTestCase):
             ('--pass-arg=asyncify-whitelist@DOS_ReadFile(unsigned short, unsigned char*, unsigned short*, bool)', None),
         ]:
             print(arg, warning)
-            err = shared.run_process(shared.WASM_OPT + ['-q', self.input_path('asyncify-pure.wast'), '--asyncify', arg], stdout=subprocess.PIPE, stderr=subprocess.PIPE).stderr.strip()
+            err = shared.run_process(shared.WASM_OPT + ['-q', self.input_path('asyncify-pure.wat'), '--asyncify', arg], stdout=subprocess.PIPE, stderr=subprocess.PIPE).stderr.strip()
             if warning:
                 self.assertIn('warning', err)
                 self.assertIn(warning, err)
@@ -53,13 +53,13 @@ class AsyncifyTest(utils.BinaryenTestCase):
                 self.assertNotIn('warning', err)
 
     def test_asyncify_blacklist_and_whitelist(self):
-        proc = shared.run_process(shared.WASM_OPT + [self.input_path('asyncify-pure.wast'), '--asyncify', '--pass-arg=asyncify-whitelist@main', '--pass-arg=asyncify-blacklist@main'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT, check=False)
+        proc = shared.run_process(shared.WASM_OPT + [self.input_path('asyncify-pure.wat'), '--asyncify', '--pass-arg=asyncify-whitelist@main', '--pass-arg=asyncify-blacklist@main'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT, check=False)
         self.assertNotEqual(proc.returncode, 0, 'must error on using both lists at once')
         self.assertIn('It makes no sense to use both a blacklist and a whitelist with asyncify', proc.stdout)
 
     def test_asyncify_imports(self):
         def test(args):
-            return shared.run_process(shared.WASM_OPT + [self.input_path('asyncify-sleep.wast'), '--asyncify', '--print'] + args, stdout=subprocess.PIPE).stdout
+            return shared.run_process(shared.WASM_OPT + [self.input_path('asyncify-sleep.wat'), '--asyncify', '--print'] + args, stdout=subprocess.PIPE).stdout
 
         normal = test(['--pass-arg=asyncify-imports@env.sleep'])
         temp = tempfile.NamedTemporaryFile().name
diff --git a/test/unit/test_finalize.py b/test/unit/test_finalize.py
index 9a5c3c750..ff4eebd9c 100644
--- a/test/unit/test_finalize.py
+++ b/test/unit/test_finalize.py
@@ -8,7 +8,7 @@ class EmscriptenFinalizeTest(utils.BinaryenTestCase):
     def test_em_asm_mangled_string(self):
         input_dir = os.path.dirname(__file__)
         p = shared.run_process(shared.WASM_EMSCRIPTEN_FINALIZE + [
-            os.path.join(input_dir, 'input', 'em_asm_mangled_string.wast'), '-o', os.devnull, '--global-base=1024'
+            os.path.join(input_dir, 'input', 'em_asm_mangled_string.wat'), '-o', os.devnull, '--global-base=1024'
         ], check=False, capture_output=True)
         self.assertNotEqual(p.returncode, 0)
         self.assertIn('Fatal: local.get of unknown in arg0 of call to emscripten_asm_const_int (used by EM_ASM* macros) in function main.', p.stderr)
diff --git a/test/unit/test_stack_ir.py b/test/unit/test_stack_ir.py
index 1fcab88d8..78086d0cc 100644
--- a/test/unit/test_stack_ir.py
+++ b/test/unit/test_stack_ir.py
@@ -6,7 +6,7 @@ from . import utils
 class StackIRTest(utils.BinaryenTestCase):
     # test that stack IR opts make a difference.
     def test_stack_ir_opts(self):
-        path = self.input_path('stack_ir.wast')
+        path = self.input_path('stack_ir.wat')
         opt = shared.run_process(shared.WASM_OPT + [path, '-O', '--generate-stack-ir', '--optimize-stack-ir', '--print-stack-ir', '-o', 'a.wasm'], capture_output=True).stdout
         nonopt = shared.run_process(shared.WASM_OPT + [path, '-O', '--generate-stack-ir', '--print-stack-ir', '-o', 'b.wasm'], capture_output=True).stdout
         # see a difference in the printed stack IR (the optimizations let us
diff --git a/test/unit/test_warnings.py b/test/unit/test_warnings.py
index 0717ae823..05fc11099 100644
--- a/test/unit/test_warnings.py
+++ b/test/unit/test_warnings.py
@@ -6,13 +6,13 @@ from . import utils
 
 class WarningsText(utils.BinaryenTestCase):
     def test_warn_on_no_passes(self):
-        err = shared.run_process(shared.WASM_OPT + [self.input_path('asyncify-pure.wast'), '-o', 'a.wasm'], stderr=subprocess.PIPE).stderr
+        err = shared.run_process(shared.WASM_OPT + [self.input_path('asyncify-pure.wat'), '-o', 'a.wasm'], stderr=subprocess.PIPE).stderr
         self.assertIn('warning: no passes specified, not doing any work', err)
 
     def test_warn_on_no_output(self):
-        err = shared.run_process(shared.WASM_OPT + [self.input_path('asyncify-pure.wast'), '-O1'], stderr=subprocess.PIPE).stderr
+        err = shared.run_process(shared.WASM_OPT + [self.input_path('asyncify-pure.wat'), '-O1'], stderr=subprocess.PIPE).stderr
         self.assertIn('warning: no output file specified, not emitting output', err)
 
     def test_quiet_suppresses_warnings(self):
-        err = shared.run_process(shared.WASM_OPT + [self.input_path('asyncify-pure.wast'), '-q'], stderr=subprocess.PIPE).stderr
+        err = shared.run_process(shared.WASM_OPT + [self.input_path('asyncify-pure.wat'), '-q'], stderr=subprocess.PIPE).stderr
         self.assertNotIn('warning', err)