Allow PNaCl NMF to set translator optimization options for experimentation.

ppapi/native_client/src/trusted/plugin/pnacl_translate_thread.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "native_client/src/trusted/plugin/pnacl_translate_thread.h"
 
 #include "native_client/src/trusted/desc/nacl_desc_wrapper.h"
 #include "native_client/src/trusted/plugin/plugin.h"
 #include "native_client/src/trusted/plugin/plugin_error.h"
 #include "native_client/src/trusted/plugin/pnacl_resources.h"
@@ skipping 21 matching lines @@
 }
 
 void PnaclTranslateThread::RunTranslate(
     const pp::CompletionCallback& finish_callback,
     const Manifest* manifest,
     const Manifest* ld_manifest,
     TempFile* obj_file,
     TempFile* nexe_file,
     ErrorInfo* error_info,
     PnaclResources* resources,
+    PnaclOptions* pnacl_options,
     PnaclCoordinator* coordinator,
     Plugin* plugin) {
   PLUGIN_PRINTF(("PnaclStreamingTranslateThread::RunTranslate)\n"));
   manifest_ = manifest;
   ld_manifest_ = ld_manifest;
   obj_file_ = obj_file;
   nexe_file_ = nexe_file;
   coordinator_error_info_ = error_info;
   resources_ = resources;
+  pnacl_options_ = pnacl_options;
   coordinator_ = coordinator;
   plugin_ = plugin;
 
   // Invoke llc followed by ld off the main thread.  This allows use of
   // blocking RPCs that would otherwise block the JavaScript main thread.
   report_translate_finished_ = finish_callback;
   translate_thread_.reset(new NaClThread);
   if (translate_thread_ == NULL) {
     TranslateFailed(ERROR_PNACL_THREAD_CREATE,
                     "could not allocate thread struct.");
@@ skipping 85 matching lines @@
     llc_subprocess_active_ = true;
     time_stats_.pnacl_llc_load_time =
         (NaClGetTimeOfDayMicroseconds() - llc_start_time);
     // Run LLC.
     PluginReverseInterface* llc_reverse =
         llc_subprocess_->service_runtime()->rev_interface();
     llc_reverse->AddTempQuotaManagedFile(obj_file_->identifier());
   }
 
   int64_t compile_start_time = NaClGetTimeOfDayMicroseconds();
-  if (!llc_subprocess_->InvokeSrpcMethod("StreamInit",
-                                         "h",
-                                         &params,
-                                         llc_out_file->desc())) {
+  bool init_success;
+  if (pnacl_options_->HasDefaultOpts()) {
+    PLUGIN_PRINTF(("PnaclCoordinator: StreamInit with default options\n"));
+    init_success = llc_subprocess_->InvokeSrpcMethod("StreamInit",
+                                                     "h",
+                                                     &params,
+                                                     llc_out_file->desc());
+  } else {
+    std::vector<char> options = pnacl_options_->GetOptCommandline();
+    init_success = llc_subprocess_->InvokeSrpcMethod(
+        "StreamInitWithOverrides",
+        "hC",
+        &params,
+        llc_out_file->desc(),
+        &options[0],
+        options.size());
+  }
+
+  if (!init_success) {
     if (llc_subprocess_->srpc_client()->GetLastError() ==
         NACL_SRPC_RESULT_APP_ERROR) {
       // The error message is only present if the error was returned from llc
       TranslateFailed(ERROR_PNACL_LLC_INTERNAL,
                       nacl::string("Stream init failed: ") +
                       nacl::string(params.outs()[0]->arrays.str));
     } else {
       TranslateFailed(ERROR_PNACL_LLC_INTERNAL,
                       "Stream init internal error");
     }
@@ skipping 176 matching lines @@
   PLUGIN_PRINTF(("~PnaclTranslateThread (translate_thread=%p)\n", this));
   AbortSubprocesses();
   NaClThreadJoin(translate_thread_.get());
   PLUGIN_PRINTF(("~PnaclTranslateThread joined\n"));
   NaClCondVarDtor(&buffer_cond_);
   NaClMutexDtor(&cond_mu_);
   NaClMutexDtor(&subprocess_mu_);
 }
 
 } // namespace plugin