Enable mmap and identity-based validation caching on pnacl-{llc,ld}.nexe

chrome/test/nacl/nacl_browsertest_uma.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 "chrome/test/base/uma_histogram_helper.h"
 #include "chrome/test/nacl/nacl_browsertest_util.h"
 #include "components/nacl/browser/nacl_browser.h"
 #include "native_client/src/trusted/service_runtime/nacl_error_code.h"
 #include "ppapi/c/private/ppb_nacl_private.h"
 
@@ skipping 10 matching lines @@
 
   // Did the plugin report success?
   histograms.ExpectUniqueSample("NaCl.LoadStatus.Plugin",
                                 PP_NACL_ERROR_LOAD_SUCCESS, 1);
 
   // Did the sel_ldr report success?
   histograms.ExpectUniqueSample("NaCl.LoadStatus.SelLdr",
                                 LOAD_OK, 1);
 
   // Check validation cache usage:
-  // For the open-web, only the IRT is considered a "safe" and
-  // identity-cachable file. The nexes and .so files are not.
-  // Should have one cache query for the IRT.
-  histograms.ExpectBucketCount("NaCl.ValidationCache.Query",
-                               nacl::NaClBrowser::CACHE_MISS, 1);
-  // TOTAL should then be 1 query so far.
-  histograms.ExpectTotalCount("NaCl.ValidationCache.Query", 1);
-  // Should have received a cache setting afterwards for IRT.
-  histograms.ExpectTotalCount("NaCl.ValidationCache.Set", 1);
+  if (IsAPnaclTest()) {
+    // Should have received 3 validation queries:
+    // - One for IRT for actual application
+    // - Two for two translator nexes
+    // The translators don't currently use the IRT, so there is no IRT cache
+    // query for those two loads. The PNaCl main nexe comes from a
+    // delete-on-close temp file, so it doesn't have a stable identity
+    // for validation caching. All three query results should be misses.
+    histograms.ExpectUniqueSample("NaCl.ValidationCache.Query",
+                                  nacl::NaClBrowser::CACHE_MISS, 3);
+    // Should have received a cache setting afterwards for IRT and translators.
+    histograms.ExpectUniqueSample("NaCl.ValidationCache.Set",
+                                  nacl::NaClBrowser::CACHE_HIT, 3);
+  } else {
+    // For the open-web, only the IRT is considered a "safe" and
+    // identity-cachable file. The nexes and .so files are not.
+    // Should have one cache query for the IRT.
+    histograms.ExpectUniqueSample("NaCl.ValidationCache.Query",
+                                  nacl::NaClBrowser::CACHE_MISS, 1);
+    // Should have received a cache setting afterwards for IRT and translators.
+    histograms.ExpectUniqueSample("NaCl.ValidationCache.Set",
+                                  nacl::NaClBrowser::CACHE_HIT, 1);
+  }
 
   // Make sure we have other important histograms.
   if (!IsAPnaclTest()) {
     histograms.ExpectTotalCount("NaCl.Perf.StartupTime.LoadModule", 1);
     histograms.ExpectTotalCount("NaCl.Perf.StartupTime.Total", 1);
     histograms.ExpectTotalCount("NaCl.Perf.Size.Manifest", 1);
     histograms.ExpectTotalCount("NaCl.Perf.Size.Nexe", 1);
   } else {
     histograms.ExpectTotalCount("NaCl.Options.PNaCl.OptLevel", 1);
     histograms.ExpectTotalCount("NaCl.Perf.Size.Manifest", 1);
@@ skipping 53 matching lines @@
   // Should have received 2 more validation queries later (IRT and NEXE),
   // and responded with a hit.
   histograms.ExpectBucketCount("NaCl.ValidationCache.Query",
                                nacl::NaClBrowser::CACHE_HIT, 2);
   // TOTAL should then be 4 queries now.
   histograms.ExpectTotalCount("NaCl.ValidationCache.Query", 4);
   // Still only 2 settings.
   histograms.ExpectTotalCount("NaCl.ValidationCache.Set", 2);
 }
 
+// Test that validation for the 2 PNaCl translator nexes can be cached.
+IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnacl,
+                       ValidationCacheOfTranslatorNexes) {
+  // Run a load test w/ one pexe cache identity.
+  RunLoadTest(FILE_PATH_LITERAL("pnacl_options.html?use_nmf=o_0"));
+
+  UMAHistogramHelper histograms;
+  histograms.Fetch();
+  // Should have received 3 validation queries:
+  // - One for IRT for actual application
+  // - Two for two translator nexes
+  // The translators don't currently use the IRT, so there is no IRT cache
+  // query for those two loads. The PNaCl main nexe comes from a
+  // delete-on-close temp file, so it doesn't have a stable identity
+  // for validation caching. All three query results should be misses.
+  histograms.ExpectUniqueSample("NaCl.ValidationCache.Query",
+                                nacl::NaClBrowser::CACHE_MISS, 3);
+  // Should have received a cache setting afterwards for IRT and translators.
+  histograms.ExpectUniqueSample("NaCl.ValidationCache.Set",
+                               nacl::NaClBrowser::CACHE_HIT, 3);
+
+  // Load the same pexe, but with a different cache identity.
+  // This means that translation will actually be redone,
+  // forcing the translators to be loaded a second time (but now with
+  // cache hits!)
+  RunLoadTest(FILE_PATH_LITERAL("pnacl_options.html?use_nmf=o_2"));
+
+  // Should now have 3 more queries on top of the previous ones.
+  histograms.ExpectTotalCount("NaCl.ValidationCache.Query", 6);
+  // With the 3 extra queries being cache hits.
+  histograms.ExpectBucketCount("NaCl.ValidationCache.Query",
+                               nacl::NaClBrowser::CACHE_HIT, 3);
+  // No extra cache settings.
+  histograms.ExpectUniqueSample("NaCl.ValidationCache.Set",
+                               nacl::NaClBrowser::CACHE_HIT, 3);
+}
+
+
 // TODO(ncbray) convert the rest of nacl_uma.py (currently in the NaCl repo.)
 // Test validation failures and crashes.
 
 }  // namespace