Add -v (-verbose/--verbose) option to llvm-rs-cc.

This change also suppresses the display of "Generating Script*." output by
default.

Change-Id: I034a3ba20acf64e1eb9ecc02133edb03b643d559

71 files changed, 47 insertions, 106 deletions

diff --git a/RSCCOptions.td b/RSCCOptions.td
index 1f56cdc..1d5f536 100644
--- a/RSCCOptions.td
+++ b/RSCCOptions.td
@@ -123,6 +123,11 @@ def reflect_cpp : Flag<["-"], "reflect-c++">,
 // Misc Options
 //===----------------------------------------------------------------------===//
 
+def verbose : Flag<["-"], "v">,
+  HelpText<"Display verbose information during the compilation">;
+def _verbose : Flag<["-"], "verbose">, Alias<verbose>;
+def __verbose : Flag<["--"], "verbose">, Alias<verbose>;
+
 def help : Flag<["-"], "help">,
   HelpText<"Print this help text">;
 def _help : Flag<["--"], "help">, Alias<help>;
diff --git a/rs_cc_options.cpp b/rs_cc_options.cpp
index f473d19..851e9f6 100644
--- a/rs_cc_options.cpp
+++ b/rs_cc_options.cpp
@@ -204,6 +204,7 @@ void slang::ParseArguments(llvm::SmallVectorImpl<const char *> &ArgVector,
     Opts.mShowHelp = Args->hasArg(OPT_help);
     Opts.mShowVersion = Args->hasArg(OPT_version);
     Opts.mDebugEmission = Args->hasArg(OPT_emit_g);
+    Opts.mVerbose = Args->hasArg(OPT_verbose);
 
     size_t OptLevel =
         clang::getLastArgIntValue(*Args, OPT_optimization_level, 3, DiagEngine);
diff --git a/rs_cc_options.h b/rs_cc_options.h
index 2905ac9..eff673a 100644
--- a/rs_cc_options.h
+++ b/rs_cc_options.h
@@ -99,6 +99,9 @@ class RSCCOptions {
   // The optimization level used in CodeGen, and encoded in emitted bitcode.
   llvm::CodeGenOpt::Level mOptimizationLevel;
 
+  // Display verbose information about the compilation on stdout.
+  bool mVerbose;
+
   RSCCOptions() {
     mOutputType = slang::Slang::OT_Bitcode;
     // Triple/CPU/Features must be hard-coded to our chosen portable ABI.
@@ -112,6 +115,7 @@ class RSCCOptions {
     mTargetAPI = RS_VERSION;
     mDebugEmission = 0;
     mOptimizationLevel = llvm::CodeGenOpt::Aggressive;
+    mVerbose = false;
   }
 };
 
diff --git a/slang_rs.cpp b/slang_rs.cpp
index 979bb67..03ef689 100644
--- a/slang_rs.cpp
+++ b/slang_rs.cpp
@@ -222,7 +222,8 @@ void SlangRS::initASTContext() {
                              getASTContext(),
                              getTargetInfo(),
                              &mPragmas,
-                             mTargetAPI);
+                             mTargetAPI,
+                             mVerbose);
 }
 
 clang::ASTConsumer
@@ -265,7 +266,7 @@ bool SlangRS::IsLocInRSHeaderFile(const clang::SourceLocation &Loc,
 
 SlangRS::SlangRS()
   : Slang(), mRSContext(NULL), mAllowRSPrefix(false), mTargetAPI(0),
-    mIsFilterscript(false) {
+    mVerbose(false), mIsFilterscript(false) {
 }
 
 bool SlangRS::compile(
@@ -306,6 +307,8 @@ bool SlangRS::compile(
     return false;
   }
 
+  mVerbose = Opts.mVerbose;
+
   // Skip generation of warnings a second time if we are doing more than just
   // a single pass over the input file.
   bool SuppressAllWarnings = (Opts.mOutputType != Slang::OT_Dependency);
diff --git a/slang_rs.h b/slang_rs.h
index d5788ef..e878179 100644
--- a/slang_rs.h
+++ b/slang_rs.h
@@ -43,6 +43,8 @@ class SlangRS : public Slang {
 
   unsigned int mTargetAPI;
 
+  bool mVerbose;
+
   bool mIsFilterscript;
 
   // Custom diagnostic identifiers
diff --git a/slang_rs_context.cpp b/slang_rs_context.cpp
index 38dfff1..42075bc 100644
--- a/slang_rs_context.cpp
+++ b/slang_rs_context.cpp
@@ -46,11 +46,13 @@ RSContext::RSContext(clang::Preprocessor &PP,
                      clang::ASTContext &Ctx,
                      const clang::TargetInfo &Target,
                      PragmaList *Pragmas,
-                     unsigned int TargetAPI)
+                     unsigned int TargetAPI,
+                     bool Verbose)
     : mPP(PP),
       mCtx(Ctx),
       mPragmas(Pragmas),
       mTargetAPI(TargetAPI),
+      mVerbose(Verbose),
       mDataLayout(NULL),
       mLLVMContext(llvm::getGlobalContext()),
       mLicenseNote(NULL),
diff --git a/slang_rs_context.h b/slang_rs_context.h
index cdb35c6..3373a8b 100644
--- a/slang_rs_context.h
+++ b/slang_rs_context.h
@@ -68,6 +68,7 @@ class RSContext {
   clang::ASTContext &mCtx;
   PragmaList *mPragmas;
   unsigned int mTargetAPI;
+  bool mVerbose;
 
   llvm::DataLayout *mDataLayout;
   llvm::LLVMContext &mLLVMContext;
@@ -102,7 +103,8 @@ class RSContext {
             clang::ASTContext &Ctx,
             const clang::TargetInfo &Target,
             PragmaList *Pragmas,
-            unsigned int TargetAPI);
+            unsigned int TargetAPI,
+            bool Verbose);
 
   inline clang::Preprocessor &getPreprocessor() const { return mPP; }
   inline clang::ASTContext &getASTContext() const { return mCtx; }
@@ -121,6 +123,10 @@ class RSContext {
     return mTargetAPI;
   }
 
+  inline bool getVerbose() const {
+    return mVerbose;
+  }
+
   inline void setLicenseNote(const std::string &S) {
     mLicenseNote = new std::string(S);
   }
diff --git a/slang_rs_reflect_utils.cpp b/slang_rs_reflect_utils.cpp
index 0134229..c841d52 100644
--- a/slang_rs_reflect_utils.cpp
+++ b/slang_rs_reflect_utils.cpp
@@ -249,7 +249,7 @@ bool RSSlangReflectUtils::GenerateJavaBitCodeAccessor(
 
   GeneratedFile out;
   if (!out.startFile(output_path, filename, context.rsFileName,
-                     context.licenseNote, true)) {
+                     context.licenseNote, true, context.verbose)) {
     return false;
   }
 
@@ -316,8 +316,11 @@ static const char *const gApacheLicenseNote =
 bool GeneratedFile::startFile(const string &outDirectory,
                               const string &outFileName,
                               const string &sourceFileName,
-                              const string *optionalLicense, bool isJava) {
-  printf("Generating %s\n", outFileName.c_str());
+                              const string *optionalLicense, bool isJava,
+                              bool verbose) {
+  if (verbose) {
+    printf("Generating %s\n", outFileName.c_str());
+  }
 
   // Create the parent directories.
   if (!outDirectory.empty()) {
diff --git a/slang_rs_reflect_utils.h b/slang_rs_reflect_utils.h
index dc17b7d..28c46b9 100644
--- a/slang_rs_reflect_utils.h
+++ b/slang_rs_reflect_utils.h
@@ -33,13 +33,15 @@ public:
   // reflectPath: where to output the generated Java file, no package name in
   // it.
   // packageName: the package of the output Java file.
+  // verbose: whether or not to print out additional info about compilation.
+  // bcStorage: where to emit bitcode to (resource file or embedded).
   struct BitCodeAccessorContext {
     const char *rsFileName;
     const char *bcFileName;
     const char *reflectPath;
     const char *packageName;
     const std::string *licenseNote;
-
+    bool verbose;
     BitCodeStorageType bcStorage;
   };
 
@@ -111,7 +113,7 @@ public:
    */
   bool startFile(const std::string &outPath, const std::string &outFileName,
                  const std::string &sourceFileName,
-                 const std::string *optionalLicense, bool isJava);
+                 const std::string *optionalLicense, bool isJava, bool verbose);
   void closeFile();
 
   void increaseIndent(); // Increases the new line indentation by 4
diff --git a/slang_rs_reflection.cpp b/slang_rs_reflection.cpp
index 04559ae..c25ef42 100644
--- a/slang_rs_reflection.cpp
+++ b/slang_rs_reflection.cpp
@@ -1924,7 +1924,8 @@ bool RSReflectionJava::startClass(AccessModifier AM, bool IsStatic,
   // Open file for class
   std::string FileName = ClassName + ".java";
   if (!mOut.startFile(mOutputDirectory, FileName, mRSSourceFileName,
-                      mRSContext->getLicenseNote(), true)) {
+                      mRSContext->getLicenseNote(), true,
+                      mRSContext->getVerbose())) {
     return false;
   }
 
diff --git a/slang_rs_reflection_cpp.cpp b/slang_rs_reflection_cpp.cpp
index dcfab2c..a313193 100644
--- a/slang_rs_reflection_cpp.cpp
+++ b/slang_rs_reflection_cpp.cpp
@@ -135,7 +135,8 @@ bool RSReflectionCpp::reflect() {
 bool RSReflectionCpp::writeHeaderFile() {
   // Create the file and write the license note.
   if (!mOut.startFile(mOutputDirectory, mClassName + ".h", mRSSourceFilePath,
-                      mRSContext->getLicenseNote(), false)) {
+                      mRSContext->getLicenseNote(), false,
+                      mRSContext->getVerbose())) {
     return false;
   }
 
@@ -289,7 +290,8 @@ bool RSReflectionCpp::genEncodedBitCode() {
 
 bool RSReflectionCpp::writeImplementationFile() {
   if (!mOut.startFile(mOutputDirectory, mClassName + ".cpp", mRSSourceFilePath,
-                      mRSContext->getLicenseNote(), false)) {
+                      mRSContext->getLicenseNote(), false,
+                      mRSContext->getVerbose())) {
     return false;
   }
 
diff --git a/tests/F_no_pragma/stdout.txt.expect b/tests/F_no_pragma/stdout.txt.expect
index 67745a1..e69de29 100644
--- a/tests/F_no_pragma/stdout.txt.expect
+++ b/tests/F_no_pragma/stdout.txt.expect
@@ -1 +0,0 @@
-Generating ScriptC_first.java
diff --git a/tests/F_one_definition_rule1/stdout.txt.expect b/tests/F_one_definition_rule1/stdout.txt.expect
index 8d0107b..e69de29 100644
--- a/tests/F_one_definition_rule1/stdout.txt.expect
+++ b/tests/F_one_definition_rule1/stdout.txt.expect
@@ -1,4 +0,0 @@
-Generating ScriptC_def1.java
-Generating ScriptField_DifferentDefinition1.java
-Generating ScriptC_def2.java
-Generating ScriptField_DifferentDefinition1.java
diff --git a/tests/F_one_definition_rule2/stdout.txt.expect b/tests/F_one_definition_rule2/stdout.txt.expect
index d0ef649..e69de29 100644
--- a/tests/F_one_definition_rule2/stdout.txt.expect
+++ b/tests/F_one_definition_rule2/stdout.txt.expect
@@ -1,4 +0,0 @@
-Generating ScriptC_def1.java
-Generating ScriptField_DifferentDefinition2.java
-Generating ScriptC_def2.java
-Generating ScriptField_DifferentDefinition2.java
diff --git a/tests/F_one_definition_rule3/stdout.txt.expect b/tests/F_one_definition_rule3/stdout.txt.expect
index 7dee31f..e69de29 100644
--- a/tests/F_one_definition_rule3/stdout.txt.expect
+++ b/tests/F_one_definition_rule3/stdout.txt.expect
@@ -1,4 +0,0 @@
-Generating ScriptC_def1.java
-Generating ScriptField_DifferentDefinition3.java
-Generating ScriptC_def2.java
-Generating ScriptField_DifferentDefinition3.java
diff --git a/tests/F_one_definition_rule4/stdout.txt.expect b/tests/F_one_definition_rule4/stdout.txt.expect
index ad2b4e6..e69de29 100644
--- a/tests/F_one_definition_rule4/stdout.txt.expect
+++ b/tests/F_one_definition_rule4/stdout.txt.expect
@@ -1,4 +0,0 @@
-Generating ScriptC_def1.java
-Generating ScriptField_DifferentDefinition4.java
-Generating ScriptC_def2.java
-Generating ScriptField_DifferentDefinition4.java
diff --git a/tests/F_one_definition_rule5/stdout.txt.expect b/tests/F_one_definition_rule5/stdout.txt.expect
index 0da8166..e69de29 100644
--- a/tests/F_one_definition_rule5/stdout.txt.expect
+++ b/tests/F_one_definition_rule5/stdout.txt.expect
@@ -1,4 +0,0 @@
-Generating ScriptC_def1.java
-Generating ScriptField_DifferentDefinition5.java
-Generating ScriptC_def2.java
-Generating ScriptField_DifferentDefinition5.java
diff --git a/tests/F_one_definition_rule6/stdout.txt.expect b/tests/F_one_definition_rule6/stdout.txt.expect
index 6f8a2cf..e69de29 100644
--- a/tests/F_one_definition_rule6/stdout.txt.expect
+++ b/tests/F_one_definition_rule6/stdout.txt.expect
@@ -1,4 +0,0 @@
-Generating ScriptC_def1.java
-Generating ScriptField_DifferentDefinition6.java
-Generating ScriptC_def2.java
-Generating ScriptField_DifferentDefinition6.java
diff --git a/tests/F_one_definition_rule7/stdout.txt.expect b/tests/F_one_definition_rule7/stdout.txt.expect
index 31e1467..e69de29 100644
--- a/tests/F_one_definition_rule7/stdout.txt.expect
+++ b/tests/F_one_definition_rule7/stdout.txt.expect
@@ -1,4 +0,0 @@
-Generating ScriptC_def1.java
-Generating ScriptField_DifferentDefinition7.java
-Generating ScriptC_def2.java
-Generating ScriptField_DifferentDefinition7.java
diff --git a/tests/F_one_definition_rule8/stdout.txt.expect b/tests/F_one_definition_rule8/stdout.txt.expect
index 78a147a..e69de29 100644
--- a/tests/F_one_definition_rule8/stdout.txt.expect
+++ b/tests/F_one_definition_rule8/stdout.txt.expect
@@ -1,6 +0,0 @@
-Generating ScriptC_def1.java
-Generating ScriptField_DifferentDefinition7.java
-Generating ScriptField_DifferentDefinition8.java
-Generating ScriptC_def2.java
-Generating ScriptField_DifferentDefinition7.java
-Generating ScriptField_DifferentDefinition8.java
diff --git a/tests/P_alloc_in_struct/stdout.txt.expect b/tests/P_alloc_in_struct/stdout.txt.expect
index 3cdb10d..e69de29 100644
--- a/tests/P_alloc_in_struct/stdout.txt.expect
+++ b/tests/P_alloc_in_struct/stdout.txt.expect
@@ -1,2 +0,0 @@
-Generating ScriptC_alloc_in_struct.java
-Generating ScriptField_s.java
diff --git a/tests/P_array_init/stdout.txt.expect b/tests/P_array_init/stdout.txt.expect
index 3c58b97..e69de29 100644
--- a/tests/P_array_init/stdout.txt.expect
+++ b/tests/P_array_init/stdout.txt.expect
@@ -1 +0,0 @@
-Generating ScriptC_array_init.java
diff --git a/tests/P_compute/stdout.txt.expect b/tests/P_compute/stdout.txt.expect
index 4b6fd5d..e69de29 100644
--- a/tests/P_compute/stdout.txt.expect
+++ b/tests/P_compute/stdout.txt.expect
@@ -1 +0,0 @@
-Generating ScriptC_compute.java
diff --git a/tests/P_constant/stdout.txt.expect b/tests/P_constant/stdout.txt.expect
index 1e0cf2b..e69de29 100644
--- a/tests/P_constant/stdout.txt.expect
+++ b/tests/P_constant/stdout.txt.expect
@@ -1 +0,0 @@
-Generating ScriptC_constant.java
diff --git a/tests/P_debug/stdout.txt.expect b/tests/P_debug/stdout.txt.expect
index 1fdf249..e69de29 100644
--- a/tests/P_debug/stdout.txt.expect
+++ b/tests/P_debug/stdout.txt.expect
@@ -1 +0,0 @@
-Generating ScriptC_debug.java
diff --git a/tests/P_dummy_root/stdout.txt.expect b/tests/P_dummy_root/stdout.txt.expect
index d9996e3..e69de29 100644
--- a/tests/P_dummy_root/stdout.txt.expect
+++ b/tests/P_dummy_root/stdout.txt.expect
@@ -1 +0,0 @@
-Generating ScriptC_dummy_root.java
diff --git a/tests/P_export_types/stdout.txt.expect b/tests/P_export_types/stdout.txt.expect
index fa88bf3..e69de29 100644
--- a/tests/P_export_types/stdout.txt.expect
+++ b/tests/P_export_types/stdout.txt.expect
@@ -1 +0,0 @@
-Generating ScriptC_export_types.java
diff --git a/tests/P_float3/stdout.txt.expect b/tests/P_float3/stdout.txt.expect
index feebada..e69de29 100644
--- a/tests/P_float3/stdout.txt.expect
+++ b/tests/P_float3/stdout.txt.expect
@@ -1,2 +0,0 @@
-Generating ScriptC_float3.java
-Generating ScriptField_s.java
diff --git a/tests/P_fs_kernel/stdout.txt.expect b/tests/P_fs_kernel/stdout.txt.expect
index 240941f..e69de29 100644
--- a/tests/P_fs_kernel/stdout.txt.expect
+++ b/tests/P_fs_kernel/stdout.txt.expect
@@ -1 +0,0 @@
-Generating ScriptC_fs_kernel.java
diff --git a/tests/P_ignore_warnings/stdout.txt.expect b/tests/P_ignore_warnings/stdout.txt.expect
index 8481c5f..e69de29 100644
--- a/tests/P_ignore_warnings/stdout.txt.expect
+++ b/tests/P_ignore_warnings/stdout.txt.expect
@@ -1 +0,0 @@
-Generating ScriptC_ignore_warnings.java
diff --git a/tests/P_kernel/stdout.txt.expect b/tests/P_kernel/stdout.txt.expect
index 47e4e73..e69de29 100644
--- a/tests/P_kernel/stdout.txt.expect
+++ b/tests/P_kernel/stdout.txt.expect
@@ -1 +0,0 @@
-Generating ScriptC_kernel.java
diff --git a/tests/P_kernel_cpp/stdout.txt.expect b/tests/P_kernel_cpp/stdout.txt.expect
index 9bb7004..e69de29 100644
--- a/tests/P_kernel_cpp/stdout.txt.expect
+++ b/tests/P_kernel_cpp/stdout.txt.expect
@@ -1,2 +0,0 @@
-Generating ScriptC_kernel_cpp.h
-Generating ScriptC_kernel_cpp.cpp
diff --git a/tests/P_license/stdout.txt.expect b/tests/P_license/stdout.txt.expect
index 0ebb983..e69de29 100644
--- a/tests/P_license/stdout.txt.expect
+++ b/tests/P_license/stdout.txt.expect
@@ -1 +0,0 @@
-Generating ScriptC_license.java
diff --git a/tests/P_local_ref_after_return/stdout.txt.expect b/tests/P_local_ref_after_return/stdout.txt.expect
index cbf31fb..e69de29 100644
--- a/tests/P_local_ref_after_return/stdout.txt.expect
+++ b/tests/P_local_ref_after_return/stdout.txt.expect
@@ -1 +0,0 @@
-Generating ScriptC_local_ref_after_return.java
diff --git a/tests/P_long64/stdout.txt.expect b/tests/P_long64/stdout.txt.expect
index db06195..e69de29 100644
--- a/tests/P_long64/stdout.txt.expect
+++ b/tests/P_long64/stdout.txt.expect
@@ -1 +0,0 @@
-Generating ScriptC_long64.java
diff --git a/tests/P_math_fp/stdout.txt.expect b/tests/P_math_fp/stdout.txt.expect
index 66c9c43..e69de29 100644
--- a/tests/P_math_fp/stdout.txt.expect
+++ b/tests/P_math_fp/stdout.txt.expect
@@ -1 +0,0 @@
-Generating ScriptC_math_fp.java
diff --git a/tests/P_math_int/stdout.txt.expect b/tests/P_math_int/stdout.txt.expect
index 70d64d3..e69de29 100644
--- a/tests/P_math_int/stdout.txt.expect
+++ b/tests/P_math_int/stdout.txt.expect
@@ -1 +0,0 @@
-Generating ScriptC_math_int.java
diff --git a/tests/P_odr_array/stdout.txt.expect b/tests/P_odr_array/stdout.txt.expect
index a9a3eb8..e69de29 100644
--- a/tests/P_odr_array/stdout.txt.expect
+++ b/tests/P_odr_array/stdout.txt.expect
@@ -1,4 +0,0 @@
-Generating ScriptC_def1.java
-Generating ScriptField_SameDefinition1.java
-Generating ScriptC_def2.java
-Generating ScriptField_SameDefinition1.java
diff --git a/tests/P_one_definition_rule/stdout.txt.expect b/tests/P_one_definition_rule/stdout.txt.expect
index a9a3eb8..e69de29 100644
--- a/tests/P_one_definition_rule/stdout.txt.expect
+++ b/tests/P_one_definition_rule/stdout.txt.expect
@@ -1,4 +0,0 @@
-Generating ScriptC_def1.java
-Generating ScriptField_SameDefinition1.java
-Generating ScriptC_def2.java
-Generating ScriptField_SameDefinition1.java
diff --git a/tests/P_ooo_compute/stdout.txt.expect b/tests/P_ooo_compute/stdout.txt.expect
index d7cbdb3..e69de29 100644
--- a/tests/P_ooo_compute/stdout.txt.expect
+++ b/tests/P_ooo_compute/stdout.txt.expect
@@ -1 +0,0 @@
-Generating ScriptC_ooo_compute.java
diff --git a/tests/P_overload/stdout.txt.expect b/tests/P_overload/stdout.txt.expect
index bd59974..e69de29 100644
--- a/tests/P_overload/stdout.txt.expect
+++ b/tests/P_overload/stdout.txt.expect
@@ -1 +0,0 @@
-Generating ScriptC_overload.java
diff --git a/tests/P_redefine_RS_VERSION/stdout.txt.expect b/tests/P_redefine_RS_VERSION/stdout.txt.expect
index 45aa9ae..e69de29 100644
--- a/tests/P_redefine_RS_VERSION/stdout.txt.expect
+++ b/tests/P_redefine_RS_VERSION/stdout.txt.expect
@@ -1 +0,0 @@
-Generating ScriptC_redefine_RS_VERSION.java
diff --git a/tests/P_refcount/stdout.txt.expect b/tests/P_refcount/stdout.txt.expect
index 5d8593c..e69de29 100644
--- a/tests/P_refcount/stdout.txt.expect
+++ b/tests/P_refcount/stdout.txt.expect
@@ -1,2 +0,0 @@
-Generating ScriptC_refcount.java
-Generating ScriptField_hasMatrix.java
diff --git a/tests/P_root_11_i/stdout.txt.expect b/tests/P_root_11_i/stdout.txt.expect
index edb0262..e69de29 100644
--- a/tests/P_root_11_i/stdout.txt.expect
+++ b/tests/P_root_11_i/stdout.txt.expect
@@ -1 +0,0 @@
-Generating ScriptC_root_11_i.java
diff --git a/tests/P_root_11_iouxy/stdout.txt.expect b/tests/P_root_11_iouxy/stdout.txt.expect
index 28ee206..e69de29 100644
--- a/tests/P_root_11_iouxy/stdout.txt.expect
+++ b/tests/P_root_11_iouxy/stdout.txt.expect
@@ -1 +0,0 @@
-Generating ScriptC_root_11_iouxy.java
diff --git a/tests/P_root_compute/stdout.txt.expect b/tests/P_root_compute/stdout.txt.expect
index 2cb4ff8..e69de29 100644
--- a/tests/P_root_compute/stdout.txt.expect
+++ b/tests/P_root_compute/stdout.txt.expect
@@ -1 +0,0 @@
-Generating ScriptC_root_compute.java
diff --git a/tests/P_root_compute_int32_xy/stdout.txt.expect b/tests/P_root_compute_int32_xy/stdout.txt.expect
index 1a2fcfc..e69de29 100644
--- a/tests/P_root_compute_int32_xy/stdout.txt.expect
+++ b/tests/P_root_compute_int32_xy/stdout.txt.expect
@@ -1 +0,0 @@
-Generating ScriptC_root_compute_int32_xy.java
diff --git a/tests/P_root_compute_non_void_ptr_usrData/stdout.txt.expect b/tests/P_root_compute_non_void_ptr_usrData/stdout.txt.expect
index d28ca8c..e69de29 100644
--- a/tests/P_root_compute_non_void_ptr_usrData/stdout.txt.expect
+++ b/tests/P_root_compute_non_void_ptr_usrData/stdout.txt.expect
@@ -1 +0,0 @@
-Generating ScriptC_root_compute_non_void_ptr_usrData.java
diff --git a/tests/P_root_graphics/stdout.txt.expect b/tests/P_root_graphics/stdout.txt.expect
index d4a20a4..e69de29 100644
--- a/tests/P_root_graphics/stdout.txt.expect
+++ b/tests/P_root_graphics/stdout.txt.expect
@@ -1 +0,0 @@
-Generating ScriptC_root_graphics.java
diff --git a/tests/P_root_graphics_13/stdout.txt.expect b/tests/P_root_graphics_13/stdout.txt.expect
index 55185c7..e69de29 100644
--- a/tests/P_root_graphics_13/stdout.txt.expect
+++ b/tests/P_root_graphics_13/stdout.txt.expect
@@ -1 +0,0 @@
-Generating ScriptC_root_graphics_13.java
diff --git a/tests/P_rs_fp_imprecise/stdout.txt.expect b/tests/P_rs_fp_imprecise/stdout.txt.expect
index 928d48d..e69de29 100644
--- a/tests/P_rs_fp_imprecise/stdout.txt.expect
+++ b/tests/P_rs_fp_imprecise/stdout.txt.expect
@@ -1 +0,0 @@
-Generating ScriptC_rs_fp_imprecise.java
diff --git a/tests/P_rs_fp_relaxed/stdout.txt.expect b/tests/P_rs_fp_relaxed/stdout.txt.expect
index 5fbfee9..e69de29 100644
--- a/tests/P_rs_fp_relaxed/stdout.txt.expect
+++ b/tests/P_rs_fp_relaxed/stdout.txt.expect
@@ -1 +0,0 @@
-Generating ScriptC_rs_fp_relaxed.java
diff --git a/tests/P_rs_package_name/stdout.txt.expect b/tests/P_rs_package_name/stdout.txt.expect
index f3818d3..e69de29 100644
--- a/tests/P_rs_package_name/stdout.txt.expect
+++ b/tests/P_rs_package_name/stdout.txt.expect
@@ -1 +0,0 @@
-Generating ScriptC_rs_package_name.java
diff --git a/tests/P_set_target_api_11/stdout.txt.expect b/tests/P_set_target_api_11/stdout.txt.expect
index 30be159..e69de29 100644
--- a/tests/P_set_target_api_11/stdout.txt.expect
+++ b/tests/P_set_target_api_11/stdout.txt.expect
@@ -1 +0,0 @@
-Generating ScriptC_set_target_api_11.java
diff --git a/tests/P_set_target_api_12/stdout.txt.expect b/tests/P_set_target_api_12/stdout.txt.expect
index ad1a013..e69de29 100644
--- a/tests/P_set_target_api_12/stdout.txt.expect
+++ b/tests/P_set_target_api_12/stdout.txt.expect
@@ -1 +0,0 @@
-Generating ScriptC_set_target_api_12.java
diff --git a/tests/P_set_target_api_13/stdout.txt.expect b/tests/P_set_target_api_13/stdout.txt.expect
index 05c8518..e69de29 100644
--- a/tests/P_set_target_api_13/stdout.txt.expect
+++ b/tests/P_set_target_api_13/stdout.txt.expect
@@ -1 +0,0 @@
-Generating ScriptC_set_target_api_13.java
diff --git a/tests/P_set_target_api_14/stdout.txt.expect b/tests/P_set_target_api_14/stdout.txt.expect
index 80ba9ae..e69de29 100644
--- a/tests/P_set_target_api_14/stdout.txt.expect
+++ b/tests/P_set_target_api_14/stdout.txt.expect
@@ -1 +0,0 @@
-Generating ScriptC_set_target_api_14.java
diff --git a/tests/P_set_target_api_15/stdout.txt.expect b/tests/P_set_target_api_15/stdout.txt.expect
index 32ca6f8..e69de29 100644
--- a/tests/P_set_target_api_15/stdout.txt.expect
+++ b/tests/P_set_target_api_15/stdout.txt.expect
@@ -1 +0,0 @@
-Generating ScriptC_set_target_api_15.java
diff --git a/tests/P_set_target_api_16/stdout.txt.expect b/tests/P_set_target_api_16/stdout.txt.expect
index 3af6365..e69de29 100644
--- a/tests/P_set_target_api_16/stdout.txt.expect
+++ b/tests/P_set_target_api_16/stdout.txt.expect
@@ -1 +0,0 @@
-Generating ScriptC_set_target_api_16.java
diff --git a/tests/P_set_target_api_17/stdout.txt.expect b/tests/P_set_target_api_17/stdout.txt.expect
index 09cf811..e69de29 100644
--- a/tests/P_set_target_api_17/stdout.txt.expect
+++ b/tests/P_set_target_api_17/stdout.txt.expect
@@ -1 +0,0 @@
-Generating ScriptC_set_target_api_17.java
diff --git a/tests/P_set_target_api_18/stdout.txt.expect b/tests/P_set_target_api_18/stdout.txt.expect
index 99a4bc1..e69de29 100644
--- a/tests/P_set_target_api_18/stdout.txt.expect
+++ b/tests/P_set_target_api_18/stdout.txt.expect
@@ -1 +0,0 @@
-Generating ScriptC_set_target_api_18.java
diff --git a/tests/P_set_target_api_19/stdout.txt.expect b/tests/P_set_target_api_19/stdout.txt.expect
index c427ede..e69de29 100644
--- a/tests/P_set_target_api_19/stdout.txt.expect
+++ b/tests/P_set_target_api_19/stdout.txt.expect
@@ -1 +0,0 @@
-Generating ScriptC_set_target_api_19.java
diff --git a/tests/P_static_struct/stdout.txt.expect b/tests/P_static_struct/stdout.txt.expect
index f952495..e69de29 100644
--- a/tests/P_static_struct/stdout.txt.expect
+++ b/tests/P_static_struct/stdout.txt.expect
@@ -1 +0,0 @@
-Generating ScriptC_static_struct.java
diff --git a/tests/P_str_escape/stdout.txt.expect b/tests/P_str_escape/stdout.txt.expect
index 2c9f647..e69de29 100644
--- a/tests/P_str_escape/stdout.txt.expect
+++ b/tests/P_str_escape/stdout.txt.expect
@@ -1 +0,0 @@
-Generating ScriptC_strescape.java
diff --git a/tests/P_unknown_function/stdout.txt.expect b/tests/P_unknown_function/stdout.txt.expect
index 26e7d01..e69de29 100644
--- a/tests/P_unknown_function/stdout.txt.expect
+++ b/tests/P_unknown_function/stdout.txt.expect
@@ -1,2 +0,0 @@
-Generating ScriptC_unknown_function.java
-Generating ScriptC_zzz.java
diff --git a/tests/P_use_RS_VERSION/stdout.txt.expect b/tests/P_use_RS_VERSION/stdout.txt.expect
index 1dc91c5..e69de29 100644
--- a/tests/P_use_RS_VERSION/stdout.txt.expect
+++ b/tests/P_use_RS_VERSION/stdout.txt.expect
@@ -1 +0,0 @@
-Generating ScriptC_use_RS_VERSION.java
diff --git a/tests/P_verbose/stderr.txt.expect b/tests/P_verbose/stderr.txt.expect
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/tests/P_verbose/stderr.txt.expect
diff --git a/tests/P_verbose/stdout.txt.expect b/tests/P_verbose/stdout.txt.expect
new file mode 100644
index 0000000..bb8a171
--- /dev/null
+++ b/tests/P_verbose/stdout.txt.expect
@@ -0,0 +1 @@
+Generating ScriptC_verbose.java
diff --git a/tests/P_verbose/verbose.rs b/tests/P_verbose/verbose.rs
new file mode 100644
index 0000000..7815a77
--- /dev/null
+++ b/tests/P_verbose/verbose.rs
@@ -0,0 +1,3 @@
+// -v
+#pragma version(1)
+#pragma rs java_package_name(foo)
diff --git a/tests/P_warnings/stdout.txt.expect b/tests/P_warnings/stdout.txt.expect
index 55370e2..e69de29 100644
--- a/tests/P_warnings/stdout.txt.expect
+++ b/tests/P_warnings/stdout.txt.expect
@@ -1 +0,0 @@
-Generating ScriptC_warnings.java
diff --git a/tests/P_warnings_rsSetElementAt/stdout.txt.expect b/tests/P_warnings_rsSetElementAt/stdout.txt.expect
index 3e54eed..e69de29 100644
--- a/tests/P_warnings_rsSetElementAt/stdout.txt.expect
+++ b/tests/P_warnings_rsSetElementAt/stdout.txt.expect
@@ -1 +0,0 @@
-Generating ScriptC_setelementat.java