Add a switch for using PNaCl Subzero and use it for -O0 translation.

components/nacl/renderer/plugin/pnacl_coordinator.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 "components/nacl/renderer/plugin/pnacl_coordinator.h"
 
 #include <algorithm>
 #include <sstream>
 #include <utility>
 
@@ skipping 83 matching lines @@
     const pp::CompletionCallback& translate_notify_callback) {
   PLUGIN_PRINTF(("PnaclCoordinator::BitcodeToNative (plugin=%p, pexe=%s)\n",
                  static_cast<void*>(plugin), pexe_url.c_str()));
   PnaclCoordinator* coordinator =
       new PnaclCoordinator(plugin, pexe_url,
                            pnacl_options,
                            translate_notify_callback);
 
   GetNaClInterface()->SetPNaClStartTime(plugin->pp_instance());
   int cpus = plugin->nacl_interface()->GetNumberOfProcessors();
-  coordinator->split_module_count_ = std::min(4, std::max(1, cpus));
-
+  coordinator->num_threads_ = std::min(4, std::max(1, cpus));
+  if (pnacl_options.use_subzero) {
+    coordinator->split_module_count_ = 1;
+  } else {
+    coordinator->split_module_count_ = coordinator->num_threads_;
+  }
   // First start a network request for the pexe, to tickle the component
   // updater's On-Demand resource throttler, and to get Last-Modified/ETag
   // cache information. We can cancel the request later if there's
   // a bitcode->nexe cache hit.
   coordinator->OpenBitcodeStream();
   return coordinator;
 }
 
 PnaclCoordinator::PnaclCoordinator(
     Plugin* plugin,
     const std::string& pexe_url,
     const PP_PNaClOptions& pnacl_options,
     const pp::CompletionCallback& translate_notify_callback)
-  : translate_finish_error_(PP_OK),
-    plugin_(plugin),
-    translate_notify_callback_(translate_notify_callback),
-    translation_finished_reported_(false),
-    pexe_url_(pexe_url),
-    pnacl_options_(pnacl_options),
-    architecture_attributes_(GetArchitectureAttributes(plugin)),
-    split_module_count_(1),
-    error_already_reported_(false),
-    pexe_size_(0),
-    pexe_bytes_compiled_(0),
-    expected_pexe_size_(-1) {
+    : translate_finish_error_(PP_OK),
+      plugin_(plugin),
+      translate_notify_callback_(translate_notify_callback),
+      translation_finished_reported_(false),
+      pexe_url_(pexe_url),
+      pnacl_options_(pnacl_options),
+      architecture_attributes_(GetArchitectureAttributes(plugin)),
+      split_module_count_(0),
+      num_threads_(0),
+      error_already_reported_(false),
+      pexe_size_(0),
+      pexe_bytes_compiled_(0),
+      expected_pexe_size_(-1) {
   callback_factory_.Initialize(this);
 }
 
 PnaclCoordinator::~PnaclCoordinator() {
   PLUGIN_PRINTF(("PnaclCoordinator::~PnaclCoordinator (this=%p, "
                  "translate_thread=%p\n",
                  static_cast<void*>(this), translate_thread_.get()));
   // Stopping the translate thread will cause the translate thread to try to
   // run translation_complete_callback_ on the main thread.  This destructor is
   // running from the main thread, and by the time it exits, callback_factory_
   // will have been destroyed.  This will result in the cancellation of
   // translation_complete_callback_, so no notification will be delivered.
   if (translate_thread_.get() != NULL)
     translate_thread_->AbortSubprocesses();
   if (!translation_finished_reported_) {
     plugin_->nacl_interface()->ReportTranslationFinished(
-        plugin_->pp_instance(),
-        PP_FALSE, 0, 0, 0);
+        plugin_->pp_instance(), PP_FALSE, pnacl_options_.opt_level,
+        pnacl_options_.use_subzero, 0, 0);
   }
   // Force deleting the translate_thread now. It must be deleted
   // before any scoped_* fields hanging off of PnaclCoordinator
   // since the thread may be accessing those fields.
   // It will also be accessing obj_files_.
   translate_thread_.reset(NULL);
   for (size_t i = 0; i < obj_files_.size(); i++)
     delete obj_files_[i];
 }
 
@@ skipping 27 matching lines @@
   // Note: this doesn't *cancel* the callbacks from the factories attached
   // to the various helper classes (e.g., pnacl_resources). Thus, those
   // callbacks may still run asynchronously.  We let those run but ignore
   // any other errors they may generate so that they do not end up running
   // translate_notify_callback_, which has already been freed.
   callback_factory_.CancelAll();
   if (!error_already_reported_) {
     error_already_reported_ = true;
     translation_finished_reported_ = true;
     plugin_->nacl_interface()->ReportTranslationFinished(
-        plugin_->pp_instance(),
-        PP_FALSE, 0, 0, 0);
+        plugin_->pp_instance(), PP_FALSE, pnacl_options_.opt_level,
+        pnacl_options_.use_subzero, 0, 0);
     translate_notify_callback_.Run(PP_ERROR_FAILED);
   }
 }
 
 // Signal that Pnacl translation completed normally.
 void PnaclCoordinator::TranslateFinished(int32_t pp_error) {
   PLUGIN_PRINTF(("PnaclCoordinator::TranslateFinished (pp_error=%"
                  NACL_PRId32 ")\n", pp_error));
   // Bail out if there was an earlier error (e.g., pexe load failure),
   // or if there is an error from the translation thread.
@@ skipping 27 matching lines @@
   }
   // The nexe is written to the temp_nexe_file_.  We must Reset() the file
   // pointer to be able to read it again from the beginning.
   temp_nexe_file_->Reset();
 
   // Report to the browser that translation finished. The browser will take
   // care of storing the nexe in the cache.
   translation_finished_reported_ = true;
   plugin_->nacl_interface()->ReportTranslationFinished(
       plugin_->pp_instance(), PP_TRUE, pnacl_options_.opt_level,
-      pexe_size_, translate_thread_->GetCompileTime());
+      pnacl_options_.use_subzero, pexe_size_,
+      translate_thread_->GetCompileTime());
 
   NexeReadDidOpen(PP_OK);
 }
 
 void PnaclCoordinator::NexeReadDidOpen(int32_t pp_error) {
   PLUGIN_PRINTF(("PnaclCoordinator::NexeReadDidOpen (pp_error=%"
                  NACL_PRId32 ")\n", pp_error));
   if (pp_error != PP_OK) {
     if (pp_error == PP_ERROR_FILENOTFOUND) {
       ReportPpapiError(PP_NACL_ERROR_PNACL_CACHE_FETCH_NOTFOUND,
@@ skipping 22 matching lines @@
   // that get downloaded before the compilation thread is accepting
   // SRPCs won't get dropped.
   translate_thread_.reset(new PnaclTranslateThread());
   if (translate_thread_ == NULL) {
     ReportNonPpapiError(
         PP_NACL_ERROR_PNACL_THREAD_CREATE,
         "PnaclCoordinator: could not allocate translation thread.");
     return;
   }
 
-  GetNaClInterface()->StreamPexe(plugin_->pp_instance(),
-                                 pexe_url_.c_str(),
-                                 pnacl_options_.opt_level,
-                                 &kPexeStreamHandler,
-                                 this);
+  GetNaClInterface()->StreamPexe(
+      plugin_->pp_instance(), pexe_url_.c_str(), pnacl_options_.opt_level,
+      pnacl_options_.use_subzero, &kPexeStreamHandler, this);
 }
 
 void PnaclCoordinator::BitcodeStreamCacheHit(PP_FileHandle handle) {
   if (handle == PP_kInvalidFileHandle) {
     ReportNonPpapiError(
         PP_NACL_ERROR_PNACL_CREATE_TEMP,
         std::string(
             "PnaclCoordinator: Got bad temp file handle from GetNexeFd"));
     BitcodeStreamDidFinish(PP_ERROR_FAILED);
     return;
   }
   temp_nexe_file_.reset(new TempFile(plugin_, handle));
   // Open it for reading as the cached nexe file.
   NexeReadDidOpen(temp_nexe_file_->Open(false));
 }
 
 void PnaclCoordinator::BitcodeStreamCacheMiss(int64_t expected_pexe_size,
                                               PP_FileHandle nexe_handle) {
   // IMPORTANT: Make sure that PnaclResources::StartLoad() is only
   // called after you receive a response to a request for a .pexe file.
   //
   // The component updater's resource throttles + OnDemand update/install
   // should block the URL request until the compiler is present. Now we
   // can load the resources (e.g. llc and ld nexes).
-  resources_.reset(new PnaclResources(plugin_));
+  resources_.reset(new PnaclResources(plugin_, pnacl_options_.use_subzero));
   CHECK(resources_ != NULL);
 
   // The first step of loading resources: read the resource info file.
   if (!resources_->ReadResourceInfo()) {
     ExitWithError();
     return;
   }
 
   // Second step of loading resources: call StartLoad to load pnacl-llc
   // and pnacl-ld, based on the filenames found in the resource info file.
@@ skipping 106 matching lines @@
 
 void PnaclCoordinator::RunTranslate(int32_t pp_error) {
   PLUGIN_PRINTF(("PnaclCoordinator::RunTranslate (pp_error=%"
                  NACL_PRId32 ")\n", pp_error));
   // Invoke llc followed by ld off the main thread.  This allows use of
   // blocking RPCs that would otherwise block the JavaScript main thread.
   pp::CompletionCallback report_translate_finished =
       callback_factory_.NewCallback(&PnaclCoordinator::TranslateFinished);
 
   CHECK(translate_thread_ != NULL);
-  translate_thread_->RunTranslate(report_translate_finished,
-                                  &obj_files_,
-                                  temp_nexe_file_.get(),
-                                  invalid_desc_wrapper_.get(),
-                                  &error_info_,
-                                  resources_.get(),
-                                  &pnacl_options_,
-                                  architecture_attributes_,
-                                  this,
-                                  plugin_);
+  translate_thread_->RunTranslate(report_translate_finished, &obj_files_,
+                                  num_threads_, temp_nexe_file_.get(),
+                                  invalid_desc_wrapper_.get(), &error_info_,
+                                  resources_.get(), &pnacl_options_,
+                                  architecture_attributes_, this, plugin_);
 }
 
 }  // namespace plugin