Rename wasm-opcodecnt to wasm-stats (WebAssembly#2298)

aheejin · Sep 19, 2023 · dddc03d · dddc03d
1 parent 3b108c1
commit dddc03d
Show file tree

Hide file tree

Showing 37 changed files with 65 additions and 67 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -557,10 +557,10 @@ if (BUILD_TOOLS)
     INSTALL
   )
 
-  # wasm-opcodecnt
+  # wasm-stats
   wabt_executable(
-    NAME wasm-opcodecnt
-    SOURCES src/tools/wasm-opcodecnt.cc src/binary-reader-opcnt.cc
+    NAME wasm-stats
+    SOURCES src/tools/wasm-stats.cc src/binary-reader-stats.cc
     INSTALL
   )
 

diff --git a/README.md b/README.md
@@ -14,7 +14,7 @@ WABT (we pronounce it "wabbit") is a suite of tools for WebAssembly, including:
  - [**wasm-strip**](https://webassembly.github.io/wabt/doc/wasm-strip.1.html): remove sections of a WebAssembly binary file
  - [**wasm-validate**](https://webassembly.github.io/wabt/doc/wasm-validate.1.html): validate a file in the WebAssembly binary format
  - [**wast2json**](https://webassembly.github.io/wabt/doc/wast2json.1.html): convert a file in the wasm spec test format to a JSON file and associated wasm binary files
- - [**wasm-opcodecnt**](https://webassembly.github.io/wabt/doc/wasm-opcodecnt.1.html): count opcode usage for instructions
+ - [**wasm-stats**](https://webassembly.github.io/wabt/doc/wasm-stats.1.html): output stats for a module
  - [**spectest-interp**](https://webassembly.github.io/wabt/doc/spectest-interp.1.html): read a Spectest JSON file, and run its tests in the interpreter
 
 These tools are intended for use in (or for development of) toolchains or other

diff --git a/docs/doc/spectest-interp.1.html b/docs/doc/spectest-interp.1.html
@@ -90,7 +90,7 @@ <h1 class="Sh" id="SEE_ALSO"><a class="permalink" href="#SEE_ALSO">SEE
   ALSO</a></h1>
 <a class="Xr" href="wasm-interp.1.html">wasm-interp(1)</a>,
   <a class="Xr" href="wasm-objdump.1.html">wasm-objdump(1)</a>,
-  <a class="Xr" href="wasm-opcodecnt.1.html">wasm-opcodecnt(1)</a>,
+  <a class="Xr" href="wasm-stats.1.html">wasm-stats(1)</a>,
   <a class="Xr" href="wasm-strip.1.html">wasm-strip(1)</a>,
   <a class="Xr" href="wasm-validate.1.html">wasm-validate(1)</a>,
   <a class="Xr" href="wasm2c.1.html">wasm2c(1)</a>,

diff --git a/docs/doc/wasm-decompile.1.html b/docs/doc/wasm-decompile.1.html
@@ -80,7 +80,7 @@ <h1 class="Sh" id="SEE_ALSO"><a class="permalink" href="#SEE_ALSO">SEE
 <a class="Xr" href="wasm2wat.1.html">wasm2wat(1)</a>,
   <a class="Xr" href="wasm-interp.1.html">wasm-interp(1)</a>,
   <a class="Xr" href="wasm-objdump.1.html">wasm-objdump(1)</a>,
-  <a class="Xr" href="wasm-opcodecnt.1.html">wasm-opcodecnt(1)</a>,
+  <a class="Xr" href="wasm-stats.1.html">wasm-stats(1)</a>,
   <a class="Xr" href="wasm-strip.1.html">wasm-strip(1)</a>,
   <a class="Xr" href="wasm-validate.1.html">wasm-validate(1)</a>,
   <a class="Xr" href="wasm2c.1.html">wasm2c(1)</a>,

diff --git a/docs/doc/wasm-interp.1.html b/docs/doc/wasm-interp.1.html
@@ -102,7 +102,7 @@ <h1 class="Sh" id="EXAMPLES"><a class="permalink" href="#EXAMPLES">EXAMPLES</a><
 <h1 class="Sh" id="SEE_ALSO"><a class="permalink" href="#SEE_ALSO">SEE
   ALSO</a></h1>
 <a class="Xr" href="wasm-objdump.1.html">wasm-objdump(1)</a>,
-  <a class="Xr" href="wasm-opcodecnt.1.html">wasm-opcodecnt(1)</a>,
+  <a class="Xr" href="wasm-stats.1.html">wasm-stats(1)</a>,
   <a class="Xr" href="wasm-strip.1.html">wasm-strip(1)</a>,
   <a class="Xr" href="wasm-validate.1.html">wasm-validate(1)</a>,
   <a class="Xr" href="wasm2c.1.html">wasm2c(1)</a>,

diff --git a/docs/doc/wasm-objdump.1.html b/docs/doc/wasm-objdump.1.html
@@ -77,7 +77,7 @@ <h1 class="Sh" id="EXAMPLES"><a class="permalink" href="#EXAMPLES">EXAMPLES</a><
 <h1 class="Sh" id="SEE_ALSO"><a class="permalink" href="#SEE_ALSO">SEE
   ALSO</a></h1>
 <a class="Xr" href="wasm-interp.1.html">wasm-interp(1)</a>,
-  <a class="Xr" href="wasm-opcodecnt.1.html">wasm-opcodecnt(1)</a>,
+  <a class="Xr" href="wasm-stats.1.html">wasm-stats(1)</a>,
   <a class="Xr" href="wasm-strip.1.html">wasm-strip(1)</a>,
   <a class="Xr" href="wasm-validate.1.html">wasm-validate(1)</a>,
   <a class="Xr" href="wasm2c.1.html">wasm2c(1)</a>,

diff --git a/docs/doc/wasm-opcodecnt.1.html → docs/doc/wasm-stats.1.html b/docs/doc/wasm-opcodecnt.1.html → docs/doc/wasm-stats.1.html
@@ -27,22 +27,22 @@
 <div class="manual-text">
 <section class="Sh">
 <h1 class="Sh" id="NAME"><a class="permalink" href="#NAME">NAME</a></h1>
-<code class="Nm">wasm-opcodecnt</code> &#x2014;
-<div class="Nd">count opcode usage for instructions</div>
+<code class="Nm">wasm-stats</code> &#x2014;
+<div class="Nd">show stats for a module</div>
 </section>
 <section class="Sh">
 <h1 class="Sh" id="SYNOPSIS"><a class="permalink" href="#SYNOPSIS">SYNOPSIS</a></h1>
 <table class="Nm">
   <tr>
-    <td><code class="Nm">wasm-opcodecnt</code></td>
+    <td><code class="Nm">wasm-stats</code></td>
     <td>[options] <var class="Ar">file ...</var></td>
   </tr>
 </table>
 </section>
 <section class="Sh">
 <h1 class="Sh" id="DESCRIPTION"><a class="permalink" href="#DESCRIPTION">DESCRIPTION</a></h1>
-<code class="Nm">wasm-opcodecnt</code> reads a file in the wasm binary format,
-  and counts opcode usage for instructions.
+<code class="Nm">wasm-stats</code> reads a file in the wasm binary format,
+  and shows stats.
 <p class="Pp">The options are as follows:</p>
 <dl class="Bl-tag">
   <dt><a class="permalink" href="#v"><code class="Fl" id="v">-v</code></a>,
@@ -64,9 +64,9 @@ <h1 class="Sh" id="DESCRIPTION"><a class="permalink" href="#DESCRIPTION">DESCRIP
 </section>
 <section class="Sh">
 <h1 class="Sh" id="EXAMPLES"><a class="permalink" href="#EXAMPLES">EXAMPLES</a></h1>
-Parse binary file test.wasm and write pcode dist file test.dist
+Parse binary file test.wasm and write opcode dist file test.dist
 <p class="Pp"></p>
-<div class="Bd Bd-indent"><code class="Li">$ wasm-opcodecnt test.wasm -o
+<div class="Bd Bd-indent"><code class="Li">$ wasm-stats test.wasm -o
   test.dist</code></div>
 </section>
 <section class="Sh">

diff --git a/docs/doc/wasm-strip.1.html b/docs/doc/wasm-strip.1.html
@@ -60,7 +60,7 @@ <h1 class="Sh" id="SEE_ALSO"><a class="permalink" href="#SEE_ALSO">SEE
   ALSO</a></h1>
 <a class="Xr" href="wasm-interp.1.html">wasm-interp(1)</a>,
   <a class="Xr" href="wasm-objdump.1.html">wasm-objdump(1)</a>,
-  <a class="Xr" href="wasm-opcodecnt.1.html">wasm-opcodecnt(1)</a>,
+  <a class="Xr" href="wasm-stats.1.html">wasm-stats(1)</a>,
   <a class="Xr" href="wasm-validate.1.html">wasm-validate(1)</a>,
   <a class="Xr" href="wasm2c.1.html">wasm2c(1)</a>,
   <a class="Xr" href="wasm2wat.1.html">wasm2wat(1)</a>,

diff --git a/docs/doc/wasm-validate.1.html b/docs/doc/wasm-validate.1.html
@@ -84,7 +84,7 @@ <h1 class="Sh" id="SEE_ALSO"><a class="permalink" href="#SEE_ALSO">SEE
   ALSO</a></h1>
 <a class="Xr" href="wasm-interp.1.html">wasm-interp(1)</a>,
   <a class="Xr" href="wasm-objdump.1.html">wasm-objdump(1)</a>,
-  <a class="Xr" href="wasm-opcodecnt.1.html">wasm-opcodecnt(1)</a>,
+  <a class="Xr" href="wasm-stats.1.html">wasm-stats(1)</a>,
   <a class="Xr" href="wasm-strip.1.html">wasm-strip(1)</a>,
   <a class="Xr" href="wasm2c.1.html">wasm2c(1)</a>,
   <a class="Xr" href="wasm2wat.1.html">wasm2wat(1)</a>,

diff --git a/docs/doc/wasm2c.1.html b/docs/doc/wasm2c.1.html
@@ -86,7 +86,7 @@ <h1 class="Sh" id="SEE_ALSO"><a class="permalink" href="#SEE_ALSO">SEE
   ALSO</a></h1>
 <a class="Xr" href="wasm-interp.1.html">wasm-interp(1)</a>,
   <a class="Xr" href="wasm-objdump.1.html">wasm-objdump(1)</a>,
-  <a class="Xr" href="wasm-opcodecnt.1.html">wasm-opcodecnt(1)</a>,
+  <a class="Xr" href="wasm-stats.1.html">wasm-stats(1)</a>,
   <a class="Xr" href="wasm-strip.1.html">wasm-strip(1)</a>,
   <a class="Xr" href="wasm-validate.1.html">wasm-validate(1)</a>,
   <a class="Xr" href="wasm2wat.1.html">wasm2wat(1)</a>,

diff --git a/docs/doc/wasm2wat.1.html b/docs/doc/wasm2wat.1.html
@@ -97,7 +97,7 @@ <h1 class="Sh" id="SEE_ALSO"><a class="permalink" href="#SEE_ALSO">SEE
   ALSO</a></h1>
 <a class="Xr" href="wasm-interp.1.html">wasm-interp(1)</a>,
   <a class="Xr" href="wasm-objdump.1.html">wasm-objdump(1)</a>,
-  <a class="Xr" href="wasm-opcodecnt.1.html">wasm-opcodecnt(1)</a>,
+  <a class="Xr" href="wasm-stats.1.html">wasm-stats(1)</a>,
   <a class="Xr" href="wasm-strip.1.html">wasm-strip(1)</a>,
   <a class="Xr" href="wasm-validate.1.html">wasm-validate(1)</a>,
   <a class="Xr" href="wasm2c.1.html">wasm2c(1)</a>,

diff --git a/docs/doc/wast2json.1.html b/docs/doc/wast2json.1.html
@@ -97,7 +97,7 @@ <h1 class="Sh" id="SEE_ALSO"><a class="permalink" href="#SEE_ALSO">SEE
   ALSO</a></h1>
 <a class="Xr" href="wasm-interp.1.html">wasm-interp(1)</a>,
   <a class="Xr" href="wasm-objdump.1.html">wasm-objdump(1)</a>,
-  <a class="Xr" href="wasm-opcodecnt.1.html">wasm-opcodecnt(1)</a>,
+  <a class="Xr" href="wasm-stats.1.html">wasm-stats(1)</a>,
   <a class="Xr" href="wasm-strip.1.html">wasm-strip(1)</a>,
   <a class="Xr" href="wasm-validate.1.html">wasm-validate(1)</a>,
   <a class="Xr" href="wasm2c.1.html">wasm2c(1)</a>,

diff --git a/docs/doc/wat-desugar.1.html b/docs/doc/wat-desugar.1.html
@@ -95,7 +95,7 @@ <h1 class="Sh" id="SEE_ALSO"><a class="permalink" href="#SEE_ALSO">SEE
   ALSO</a></h1>
 <a class="Xr" href="wasm-interp.1.html">wasm-interp(1)</a>,
   <a class="Xr" href="wasm-objdump.1.html">wasm-objdump(1)</a>,
-  <a class="Xr" href="wasm-opcodecnt.1.html">wasm-opcodecnt(1)</a>,
+  <a class="Xr" href="wasm-stats.1.html">wasm-stats(1)</a>,
   <a class="Xr" href="wasm-strip.1.html">wasm-strip(1)</a>,
   <a class="Xr" href="wasm-validate.1.html">wasm-validate(1)</a>,
   <a class="Xr" href="wasm2c.1.html">wasm2c(1)</a>,

diff --git a/docs/doc/wat2wasm.1.html b/docs/doc/wat2wasm.1.html
@@ -102,7 +102,7 @@ <h1 class="Sh" id="SEE_ALSO"><a class="permalink" href="#SEE_ALSO">SEE
   ALSO</a></h1>
 <a class="Xr" href="wasm-interp.1.html">wasm-interp(1)</a>,
   <a class="Xr" href="wasm-objdump.1.html">wasm-objdump(1)</a>,
-  <a class="Xr" href="wasm-opcodecnt.1.html">wasm-opcodecnt(1)</a>,
+  <a class="Xr" href="wasm-stats.1.html">wasm-stats(1)</a>,
   <a class="Xr" href="wasm-strip.1.html">wasm-strip(1)</a>,
   <a class="Xr" href="wasm-validate.1.html">wasm-validate(1)</a>,
   <a class="Xr" href="wasm2c.1.html">wasm2c(1)</a>,

diff --git a/include/wabt/binary-reader-opcnt.h → include/wabt/binary-reader-stats.h b/include/wabt/binary-reader-opcnt.h → include/wabt/binary-reader-stats.h
diff --git a/man/spectest-interp.1 b/man/spectest-interp.1
@@ -72,7 +72,7 @@ Parse test.json and run the spec tests
 .Xr wasm-decompile 1 ,
 .Xr wasm-interp 1 ,
 .Xr wasm-objdump 1 ,
-.Xr wasm-opcodecnt 1 ,
+.Xr wasm-stats 1 ,
 .Xr wasm-strip 1 ,
 .Xr wasm-validate 1 ,
 .Xr wasm2c 1 ,

diff --git a/man/wasm-decompile.1 b/man/wasm-decompile.1
@@ -66,7 +66,7 @@ Parse binary file test.wasm and write text file test.dcmp
 .Sh SEE ALSO
 .Xr wasm-interp 1 ,
 .Xr wasm-objdump 1 ,
-.Xr wasm-opcodecnt 1 ,
+.Xr wasm-stats 1 ,
 .Xr wasm-strip 1 ,
 .Xr wasm-validate 1 ,
 .Xr wasm2c 1 ,

diff --git a/man/wasm-interp.1 b/man/wasm-interp.1
@@ -95,7 +95,7 @@ Parse test.wasm and run all its exported functions, setting the value stack size
 .Sh SEE ALSO
 .Xr wasm-decompile 1 ,
 .Xr wasm-objdump 1 ,
-.Xr wasm-opcodecnt 1 ,
+.Xr wasm-stats 1 ,
 .Xr wasm-strip 1 ,
 .Xr wasm-validate 1 ,
 .Xr wasm2c 1 ,
@@ -107,4 +107,4 @@ Parse test.wasm and run all its exported functions, setting the value stack size
 .Sh BUGS
 If you find a bug, please report it at
 .br
-.Lk https://github.com/WebAssembly/wabt/issues .
+.Lk https://github.com/WebAssembly/wabt/issues .
diff --git a/man/wasm-objdump.1 b/man/wasm-objdump.1
@@ -40,7 +40,7 @@ Print section offsets instead of file offsets in code disassembly
 .Sh SEE ALSO
 .Xr wasm-decompile 1 ,
 .Xr wasm-interp 1 ,
-.Xr wasm-opcodecnt 1 ,
+.Xr wasm-stats 1 ,
 .Xr wasm-strip 1 ,
 .Xr wasm-validate 1 ,
 .Xr wasm2c 1 ,

diff --git a/man/wasm-opcodecnt.1 → man/wasm-stats.1 b/man/wasm-opcodecnt.1 → man/wasm-stats.1
@@ -2,15 +2,15 @@
 .Dt WABT 1
 .Os
 .Sh NAME
-.Nm wasm-opcodecnt
-.Nd count opcode usage for instructions
+.Nm wasm-stats
+.Nd show stats for a module
 .Sh SYNOPSIS
-.Nm wasm-opcodecnt
+.Nm wasm-stats
 .Op options
 .Ar
 .Sh DESCRIPTION
 .Nm
-Read a file in the wasm binary format, and count opcode usage for instructions.
+Read a file in the wasm binary format, and show stats.
 .Pp
 The options are as follows:
 .Bl -tag -width Ds
@@ -64,9 +64,9 @@ Cutoff for reporting counts less than N
 Separator text between element and count when reporting counts
 .El
 .Sh EXAMPLES
-Parse binary file test.wasm and write pcode dist file test.dist
+Parse binary file test.wasm and write opcode dist file test.dist
 .Pp
-.Dl $ wasm-opcodecnt test.wasm -o test.dist
+.Dl $ wasm-stats test.wasm -o test.dist
 .Sh SEE ALSO
 .Xr wasm-decompile 1 ,
 .Xr wasm-interp 1 ,

diff --git a/man/wasm-strip.1 b/man/wasm-strip.1
@@ -29,7 +29,7 @@ Remove all custom sections from test.wasm
 .Xr wasm-decompile 1 ,
 .Xr wasm-interp 1 ,
 .Xr wasm-objdump 1 ,
-.Xr wasm-opcodecnt 1 ,
+.Xr wasm-stats 1 ,
 .Xr wasm-strip 1 ,
 .Xr wasm-validate 1 ,
 .Xr wasm2c 1 ,

diff --git a/man/wasm-validate.1 b/man/wasm-validate.1
@@ -69,7 +69,7 @@ Validate binary file test.wasm
 .Xr wasm-decompile 1 ,
 .Xr wasm-interp 1 ,
 .Xr wasm-objdump 1 ,
-.Xr wasm-opcodecnt 1 ,
+.Xr wasm-stats 1 ,
 .Xr wasm-strip 1 ,
 .Xr wasm2c 1 ,
 .Xr wasm2wat 1 ,

diff --git a/man/wasm2c.1 b/man/wasm2c.1
@@ -75,7 +75,7 @@ Parse test.wasm, write test.c and test.h, but ignore the debug names, if any
 .Xr wasm-decompile 1 ,
 .Xr wasm-interp 1 ,
 .Xr wasm-objdump 1 ,
-.Xr wasm-opcodecnt 1 ,
+.Xr wasm-stats 1 ,
 .Xr wasm-strip 1 ,
 .Xr wasm-validate 1 ,
 .Xr wasm2wat 1 ,

diff --git a/man/wasm2wat.1 b/man/wasm2wat.1
@@ -85,7 +85,7 @@ Parse test.wasm, write test.wat, but ignore the debug names, if any
 .Xr wasm-decompile 1 ,
 .Xr wasm-interp 1 ,
 .Xr wasm-objdump 1 ,
-.Xr wasm-opcodecnt 1 ,
+.Xr wasm-stats 1 ,
 .Xr wasm-strip 1 ,
 .Xr wasm-validate 1 ,
 .Xr wasm2c 1 ,

diff --git a/man/wast2json.1 b/man/wast2json.1
@@ -78,7 +78,7 @@ Modules are written to spec-test.0.wasm, spec-test.1.wasm, etc.
 .Xr wasm-decompile 1 ,
 .Xr wasm-interp 1 ,
 .Xr wasm-objdump 1 ,
-.Xr wasm-opcodecnt 1 ,
+.Xr wasm-stats 1 ,
 .Xr wasm-strip 1 ,
 .Xr wasm-validate 1 ,
 .Xr wasm2c 1 ,

diff --git a/man/wat-desugar.1 b/man/wat-desugar.1
@@ -83,7 +83,7 @@ Generate names for indexed variables
 .Xr wasm-decompile 1 ,
 .Xr wasm-interp 1 ,
 .Xr wasm-objdump 1 ,
-.Xr wasm-opcodecnt 1 ,
+.Xr wasm-stats 1 ,
 .Xr wasm-strip 1 ,
 .Xr wasm-validate 1 ,
 .Xr wasm2c 1 ,

diff --git a/man/wat2wasm.1 b/man/wat2wasm.1
@@ -87,7 +87,7 @@ Parse spec-test.wast, and write verbose output to stdout (including the meaning
 .Xr wasm-decompile 1 ,
 .Xr wasm-interp 1 ,
 .Xr wasm-objdump 1 ,
-.Xr wasm-opcodecnt 1 ,
+.Xr wasm-stats 1 ,
 .Xr wasm-strip 1 ,
 .Xr wasm-validate 1 ,
 .Xr wasm2c 1 ,

diff --git a/scripts/help2man.lua b/scripts/help2man.lua
@@ -2,7 +2,7 @@
 
 local format_br = '\n.br\n'
 local tools = {
-	"wasm-decompile",	"wasm-interp",	"wasm-objdump",	"wasm-opcodecnt",
+	"wasm-decompile",	"wasm-interp",	"wasm-objdump",	"wasm-stats",
 	"wasm-strip",	"wasm-validate",	"wasm2c",	"wasm2wat",
 	"wast2json",	"wat-desugar",	"wat2wasm",	"spectest-interp"
 }

diff --git a/src/binary-reader-opcnt.cc → src/binary-reader-stats.cc b/src/binary-reader-opcnt.cc → src/binary-reader-stats.cc
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "wabt/binary-reader-opcnt.h"
+#include "wabt/binary-reader-stats.h"
 
 #include <cassert>
 #include <cinttypes>

diff --git a/src/tools/wasm-opcodecnt.cc → src/tools/wasm-stats.cc b/src/tools/wasm-opcodecnt.cc → src/tools/wasm-stats.cc
@@ -24,7 +24,7 @@
 #include <map>
 #include <vector>
 
-#include "wabt/binary-reader-opcnt.h"
+#include "wabt/binary-reader-stats.h"
 #include "wabt/binary-reader.h"
 #include "wabt/option-parser.h"
 #include "wabt/stream.h"
@@ -45,16 +45,15 @@ static std::unique_ptr<FileStream> s_log_stream;
 static Features s_features;
 
 static const char s_description[] =
-    R"(  Read a file in the wasm binary format, and count opcode usage for
-  instructions.
+    R"(  Read a file in the wasm binary format, and output stats.
 
 examples:
-  # parse binary file test.wasm and write pcode dist file test.dist
-  $ wasm-opcodecnt test.wasm -o test.dist
+  # parse binary file test.wasm and write opcode dist file test.dist
+  $ wasm-stats test.wasm -o test.dist
 )";
 
 static void ParseOptions(int argc, char** argv) {
-  OptionParser parser("wasm-opcodecnt", s_description);
+  OptionParser parser("wasm-stats", s_description);
 
   parser.AddOption('v', "verbose", "Use multiple times for more info", []() {
     s_verbose++;
@@ -63,7 +62,7 @@ static void ParseOptions(int argc, char** argv) {
   });
   s_features.AddOptions(&parser);
   parser.AddOption('o', "output", "FILENAME",
-                   "Output file for the opcode counts, by default use stdout",
+                   "Output file for the stats, by default use stdout",
                    [](const char* argument) { s_outfile = argument; });
   parser.AddOption(
       'c', "cutoff", "N", "Cutoff for reporting counts less than N",

diff --git a/test/README.md b/test/README.md
@@ -145,8 +145,8 @@ The currently supported list of tools (see
   interpreter.
 - `run-gen-wasm-decompile`: parse a "gen-wasm" text file (which can describe
   invalid binary files), then parse via `wasm-decompile` and display the result.
-- `run-opcodecnt`: parse a wasm text file, convert it to binary, then display
-  opcode usage counts.
+- `run-stats`: parse a wasm text file, convert it to binary, then display
+  stats.
 - `run-gen-spec-js`: parse wasm spec test text file, convert it to a JSON file
   and a collection of `.wasm` and `.wast` files, then take all of these files
   and generate a JavaScript file that will execute the same tests.
@@ -177,7 +177,7 @@ subdirectory:
   JavaScript file.
 - `help`: Tests the output of running with the `--help` flag on each tool.
 - `interp`: Tests the `wasm-interp` tool.
-- `opcodecnt`: Tests the `wasm-opcodecnt` tool.
+- `stats`: Tests the `wasm-stats` tool.
 - `parse`: Tests parsing via the `wat2wasm` tool.
 - `regress`: Various regression tests that are irregular and don't fit
   naturally in the other directories.

diff --git a/test/find_exe.py b/test/find_exe.py
@@ -25,7 +25,7 @@
 REPO_ROOT_DIR = os.path.dirname(SCRIPT_DIR)
 EXECUTABLES = [
     'wat2wasm', 'wast2json', 'wasm2wat', 'wasm-objdump', 'wasm-interp',
-    'wasm-opcodecnt', 'wat-desugar', 'spectest-interp', 'wasm-validate',
+    'wasm-stats', 'wat-desugar', 'spectest-interp', 'wasm-validate',
     'wasm2c', 'wasm-strip', 'wasm-decompile'
 ]
 
@@ -89,8 +89,8 @@ def GetSpectestInterpExecutable(override=None):
     return FindExecutable('spectest-interp', override)
 
 
-def GetWasmOpcodeCntExecutable(override=None):
-    return FindExecutable('wasm-opcodecnt', override)
+def GetWasmStatsExecutable(override=None):
+    return FindExecutable('wasm-stats', override)
 
 
 def GetWatDesugarExecutable(override=None):