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

Author: sbc100

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)

README.md

@@ -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())

auto_update_tests.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

check.py

@@ -20,17 +20,17 @@
 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

scripts/embedwast.py scripts/embedwat.pyscripts/embedwast.py renamed to scripts/embedwat.py

@@ -536,7 +536,7 @@ def get_multiple_opt_choices():
 # 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__':

scripts/fuzz_opt.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,18 +61,18 @@ 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)
 
 
 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)

scripts/test/lld.py

@@ -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

src/passes/CMakeLists.txt

@@ -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 @@
     )
   )
 )
-

src/passes/OptimizeInstructions.wast src/passes/OptimizeInstructions.watsrc/passes/OptimizeInstructions.wast renamed to src/passes/OptimizeInstructions.wat

@@ -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"