Changeset 286562 in webkit

Timestamp:

Dec 6, 2021, 1:01:35 PM (5 years ago)

Author:

commit-queue@webkit.org

Message:

[RAMification] Add support for dumping smaps rollups on Linux
​https://bugs.webkit.org/show_bug.cgi?id=233867

Patch by Zan Dobersek <​zdobersek@igalia.com> on 2021-12-06
Reviewed by Yusuke Suzuki.

Add the option to dump smaps rollup after the end of each RAMification
test case. This mirrors the vmmap functionality and is implemented
alongside that option.

Once the jsc binary is left idle after the test case run, the
smaps_rollup output for the given jsc process is collected from the
proc filesystem. This material is then printed out after the test
is done, following the memory footprint dump.

For now this prefers the smaps_rollup instead of the complete smaps.
In this form, it already gives a good insight into the balance between
the proportional and residential set size amounts. Complete smaps could
be beneficial later, especially if we can implement differentiation
between allocations of different types and/or purposes.

• JetStream2/RAMification.py:

(parseArgs):
(BaseRunner.init):
(BaseRunner.getResults):
(LocalRunner.runOneTest):
(main):
(main.runTestList):

Location:

trunk/PerformanceTests

Files:

• ChangeLog (modified) (1 diff)
• JetStream2/RAMification.py (modified) (7 diffs)

trunk/PerformanceTests/ChangeLog

@@ +1 @@
+2021-12-06  Zan Dobersek  <zdobersek@igalia.com>
+
+        [RAMification] Add support for dumping smaps rollups on Linux
+        https://bugs.webkit.org/show_bug.cgi?id=233867
+
+        Reviewed by Yusuke Suzuki.
+
+        Add the option to dump smaps rollup after the end of each RAMification
+        test case. This mirrors the vmmap functionality and is implemented
+        alongside that option.
+
+        Once the jsc binary is left idle after the test case run, the
+        smaps_rollup output for the given jsc process is collected from the
+        proc filesystem. This material is then printed out after the test
+        is done, following the memory footprint dump.
+
+        For now this prefers the smaps_rollup instead of the complete smaps.
+        In this form, it already gives a good insight into the balance between
+        the proportional and residential set size amounts. Complete smaps could
+        be beneficial later, especially if we can implement differentiation
+        between allocations of different types and/or purposes.
+
+        * JetStream2/RAMification.py:
+        (parseArgs):
+        (BaseRunner.__init__):
+        (BaseRunner.getResults):
+        (LocalRunner.runOneTest):
+        (main):
+        (main.runTestList):
+
 2021-11-21  Cathie Chen  <cathiechen@igalia.com>
 

trunk/PerformanceTests/JetStream2/RAMification.py

@@ -44 +44 @@
 peakFootprintRE = re.compile(r"Peak Footprint: (\d+(?:.\d+)?)")
 
-TestResult = collections.namedtuple("TestResult", ["name", "returnCode", "footprint", "peakFootprint", "vmmapOutput"])
+TestResult = collections.namedtuple("TestResult", ["name", "returnCode", "footprint", "peakFootprint", "vmmapOutput", "smapsOutput"])
 
 ramification_dir = os.path.abspath(os.path.dirname(os.path.realpath(__file__)))
@@ -122 +122 @@
     parser.add_argument("-o", "--output", dest="jsonFilename", type=str, default=None, metavar="JSON-output-file", help="Path to JSON output")
     parser.add_argument("-m", "--vmmap", dest="takeVmmap", action="store_true", default=False, help="Take a vmmap after each test")
+    parser.add_argument("--smaps", dest="takeSmaps", action="store_true", default=False, help="Take a smaps rollup after each test")
 
     args = parser.parse_args()
@@ -148 +149 @@
         self.rootDir = args.testDir
         self.environmentVars = {}
-        self.vmmapOutput = ""
+        self.vmmapOutput = "" if args.takeVmmap else None
+        self.smapsOutput = "" if args.takeSmaps else None
 
     def setup(self):
@@ -181 +183 @@
 
     def getResults(self):
-        return TestResult(name=self.testName, returnCode=self.returnCode, footprint=self.footprint, peakFootprint=self.peakFootprint, vmmapOutput=self.vmmapOutput)
+        return TestResult(name=self.testName, returnCode=self.returnCode, footprint=self.footprint, peakFootprint=self.peakFootprint, vmmapOutput=self.vmmapOutput, smapsOutput=self.smapsOutput)
 
 
@@ -212 +214 @@
 
             if "js shell waiting for input to exit" in line:
-                self.vmmapOutput = subprocess.Popen(['vmmap', '--summary', '{}'.format(proc.pid)], shell=False, stderr=subprocess.PIPE, stdout=subprocess.PIPE).stdout.read()
-                if sys.version_info[0] >= 3:
-                    self.vmmapOutput = str(self.vmmapOutput, "utf-8")
+                if self.vmmapOutput is not None:
+                    self.vmmapOutput = subprocess.Popen(['vmmap', '--summary', '{}'.format(proc.pid)], shell=False, stderr=subprocess.PIPE, stdout=subprocess.PIPE).stdout.read()
+                    if sys.version_info[0] >= 3:
+                        self.vmmapOutput = str(self.vmmapOutput, "utf-8")
+                if self.smapsOutput is not None:
+                    self.smapsOutput = subprocess.Popen(['cat', '/proc/{}/smaps_rollup'.format(proc.pid)], shell=False, stderr=subprocess.PIPE, stdout=subprocess.PIPE).stdout.read()
                 proc.stdin.write(b"done\n")
                 proc.stdin.flush()
@@ -236 +241 @@
     testRunner = args.runner(args)
 
-
-    if args.takeVmmap:
+    if args.takeVmmap or args.takeSmaps:
         testRunner.setEnv("JS_SHELL_WAIT_FOR_INPUT_TO_EXIT", "1")
 
@@ -271 +275 @@
                     if testResult.vmmapOutput:
                         print(testResult.vmmapOutput)
+                    if testResult.smapsOutput:
+                        print(testResult.smapsOutput)
                 else:
                     print