Subzero: Change the name llvm2ice to the more appropriate pnacl-sz.
Most of this is a mechanical change of 'llvm2ice' to 'pnacl-sz'. This is a convenient naming choice because both strings are the same length which minimizes the need for line length reformatting.
Python variables needed to use pnacl_sz instead, and sometimes pnacl_sz_ .
The IceConverter still uses LLVM2Ice naming, which is actually appropriate there since it actually converts LLVM IR into ICE.
I will rename tests_lit/llvm2ice_tests/ in a separate CL, otherwise this CL will look misleadingly massive and no one will review it.
BUG= none
R=kschimpf@google.com
Review URL: https://codereview.chromium.org/956123002
diff --git a/src/IceGlobalInits.h b/src/IceGlobalInits.h
index d51d587..8b06041 100644
--- a/src/IceGlobalInits.h
+++ b/src/IceGlobalInits.h
@@ -72,7 +72,7 @@
virtual bool getSuppressMangling() const = 0;
// Mangles name for cross tests, unless external and not defined locally
- // (so that relocations accross llvm2ice and pnacl-llc will work).
+ // (so that relocations accross pnacl-sz and pnacl-llc will work).
virtual IceString mangleName(GlobalContext *Ctx) const {
return getSuppressMangling() ? Name : Ctx->mangleName(Name);
}
diff --git a/src/IceTargetLowering.cpp b/src/IceTargetLowering.cpp
index d2da333..3ea9e6d 100644
--- a/src/IceTargetLowering.cpp
+++ b/src/IceTargetLowering.cpp
@@ -29,7 +29,7 @@
namespace {
-// TODO(stichnot): Move this machinery into llvm2ice.cpp.
+// TODO(stichnot): Move this machinery into main.cpp.
namespace cl = llvm::cl;
cl::opt<bool> DoNopInsertion("nop-insertion", cl::desc("Randomly insert NOPs"),
cl::init(false));
diff --git a/src/Makefile b/src/Makefile
index b6c9d0d..6f6d085 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,7 +1,7 @@
SUBZERO_LEVEL := ..
-TOOLNAME := llvm2ice
+TOOLNAME := pnacl-sz
LINK_COMPONENTS := support
# This tool has no plugins, optimize startup time.
diff --git a/src/llvm2ice.cpp b/src/main.cpp
similarity index 97%
rename from src/llvm2ice.cpp
rename to src/main.cpp
index 8b73de8..604be3d 100644
--- a/src/llvm2ice.cpp
+++ b/src/main.cpp
@@ -1,4 +1,4 @@
-//===- subzero/src/llvm2ice.cpp - Driver for testing ----------------------===//
+//===- subzero/src/main.cpp - Driver for bitcode translation --------------===//
//
// The Subzero Code Generator
//
@@ -7,9 +7,11 @@
//
//===----------------------------------------------------------------------===//
//
-// This file defines a driver that uses LLVM capabilities to parse a
-// bitcode file and build the LLVM IR, and then convert the LLVM basic
-// blocks, instructions, and operands into their Subzero equivalents.
+// This file defines a driver for translating PNaCl bitcode into native code.
+// It can either directly parse the binary bitcode file, or use LLVM routines to
+// parse a textual bitcode file into LLVM IR and then convert LLVM IR into ICE.
+// In either case, the high-level ICE is then compiled down to native code, as
+// either an ELF object file or a textual asm file.
//
//===----------------------------------------------------------------------===//
