[PCv2] add benchmark page_cycler_v2.typical_25

tools/perf/page_sets/typical_25.py

Index: tools/perf/page_sets/typical_25.py
diff --git a/tools/perf/page_sets/typical_25.py b/tools/perf/page_sets/typical_25.py
index f871ede714dcf9ada23ddb814f13802368b1d384..8f056c143767073ab231703a7263d6fe42934392 100644
--- a/tools/perf/page_sets/typical_25.py
+++ b/tools/perf/page_sets/typical_25.py
@@ -6,6 +6,7 @@ import shutil
 
 from profile_creators import profile_generator
 from telemetry.page import page as page_module
+from telemetry.page import cache_temperature as cache_temperature_module
 from telemetry.page import shared_page_state
 from telemetry import story
 
@@ -39,10 +40,12 @@ class Typical25ProfileSharedState(shared_page_state.SharedDesktopPageState):
 class Typical25Page(page_module.Page):
 
   def __init__(self, url, page_set, run_no_page_interactions,
-      shared_page_state_class=shared_page_state.SharedDesktopPageState):
+      shared_page_state_class=shared_page_state.SharedDesktopPageState,
+      cache_temperature=None):
     super(Typical25Page, self).__init__(
         url=url, page_set=page_set,
-        shared_page_state_class=shared_page_state_class)
+        shared_page_state_class=shared_page_state_class,
+        cache_temperature=cache_temperature)
     self._run_no_page_interactions = run_no_page_interactions
 
   def RunPageInteractions(self, action_runner):
@@ -57,10 +60,13 @@ class Typical25PageSet(story.StorySet):
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self, run_no_page_interactions=False,
-               page_class=Typical25Page):
+               page_class=Typical25Page,
+               cache_temperatures=None):
     super(Typical25PageSet, self).__init__(
       archive_data_file='data/typical_25.json',
       cloud_storage_bucket=story.PARTNER_BUCKET)
+    if cache_temperatures is None:
+      cache_temperatures = [cache_temperature_module.ANY]
 
     urls_list = [
       # Why: Alexa games #48
@@ -104,5 +110,6 @@ class Typical25PageSet(story.StorySet):
     ]
 
     for url in urls_list:
-      self.AddStory(
-        page_class(url, self, run_no_page_interactions))
+      for temp in cache_temperatures:
+        self.AddStory(page_class(
+          url, self, run_no_page_interactions, cache_temperature=temp))

[nednguyen, 2016/05/13 03:43:22]

I don't remember whether we concatenate the cache temperature to the page name.
If not, you may need to explicitly name the page with cache_temperature as part
of the name or telemetry will merge this pages with same name.

[eakuefner, 2016/05/16 18:27:13]

When PageTestResults.AddValue is called, all the story keys will get
concatenated to the value name. So in this case, the value from the warm page
and the value from the cold page will have different names, so Telemetry will
never attempt to merge. I think this is fine.