Merge pull request #42 from ARM-software/integration

zoybai · web-flow · commit 22cad9f8c4e4 · 2018-08-01T14:21:23.000-05:00
Integration with minor bug fixes and new colon delimiter for -o option
diff --git a/benchmarks/lockhammer/Makefile b/benchmarks/lockhammer/Makefile
@@ -1,4 +1,4 @@
-CFLAGS=-g -O2 -I. -I./include -I../../ext/mysql/include -I../../ext/linux/include -I../../ext/tbb/include
+override CFLAGS += -g -O3 -I. -I./include -I../../ext/mysql/include -I../../ext/linux/include -I../../ext/tbb/include
 
 ifneq ($(DEBUG_LEVEL),)
 ifeq ($(shell test $(DEBUG_LEVEL) -gt 0; echo $$?),0)
diff --git a/benchmarks/lockhammer/scripts/lh_sweeptest_cfg.yaml b/benchmarks/lockhammer/scripts/lh_sweeptest_cfg.yaml
@@ -37,6 +37,7 @@ globalcfg:
     execdir: ../build
     logfile: lockhammer.csv
 
+
 ## Sweep Test Settings
 #
 # Common assumptions for sweeptest:
@@ -50,7 +51,7 @@ globalcfg:
 #
 ##
 sweeptest:
-    enabled: False
+    enabled: True
     safemode: False
     cmd:
         - lh_cas_event_mutex
@@ -89,56 +90,3 @@ sweeptest:
           c: 1000ns
           p: 5000ns
           o: lstopo
-
-## Unittest Settings
-#
-# Common assumptions for unittest:
-# Only cover functional correctness, use as least time as possible
-# Normal runtime should be around 1 minute
-# t=0 means maximum core count
-#
-##
-unittest:
-    enabled: True
-    safemode: True
-    testcase:
-        - cmd:
-            - lh_cas_event_mutex
-            - lh_cas_lockref
-            - lh_cas_rw_lock
-            - lh_empty
-            - lh_event_mutex
-            - lh_incdec_refcount
-            - lh_jvm_objectmonitor
-            - lh_osq_lock
-            - lh_queued_spinlock
-            - lh_swap_mutex
-            - lh_tbb_spin_rw_mutex
-            - lh_ticket_spinlock
-          cmd_aarch64: [lh_hybrid_spinlock, lh_hybrid_spinlock_fastdequeue]
-          cmd_x86_64:
-          t: [1, 0]
-          a: 100
-          c: [0ns, 50ns]
-          p: [0ns, 50ns]
-
-        - cmd: lh_osq_lock
-          t: [1, 0]
-          a: 100
-          c: 50ns
-          p: 0ns
-          o: lstopo
-          extra:
-              u: 10
-              s: 2
-
-        - cmd: lh_tbb_spin_rw_mutex
-          t: [1, 0]
-          a: 100
-          c: 50ns
-          p: 0ns
-          i: 1
-          o: '0,1,2,3'
-          extra:
-              r: 4
-              m: 1
diff --git a/benchmarks/lockhammer/scripts/lh_unittest_cfg.yaml b/benchmarks/lockhammer/scripts/lh_unittest_cfg.yaml
@@ -0,0 +1,93 @@
+# Copyright (c) 2018, ARM Limited. All rights reserved.
+#
+# SPDX-License-Identifier:    BSD-3-Clause
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# Redistributions of source code must retain the above copyright notice, this
+# list of conditions and the following disclaimer.
+#
+# Redistributions in binary form must reproduce the above copyright notice, this
+# list of conditions and the following disclaimer in the documentation and/or
+# other materials provided with the distribution.
+#
+# Neither the name of ARM Limited nor the names of its contributors may be used
+# to endorse or promote products derived from this software without specific
+# prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+# TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+# The views and conclusions contained in the software and documentation are those
+# of the authors and should not be interpreted as representing official policies,
+# either expressed or implied, of this project.
+
+
+## Global Settings
+globalcfg:
+    execdir: ../build
+    logfile: lockhammer.csv
+
+
+## Unittest Settings
+#
+# Common assumptions for unittest:
+# Only cover functional correctness, use as least time as possible
+# Normal runtime should be around 1 minute
+# t=0 means maximum core count
+# o=lstopo means using lstopo output as preferred thread pinning order
+#
+##
+unittest:
+    enabled: True
+    safemode: True
+    testcase:
+        - cmd:
+            - lh_cas_event_mutex
+            - lh_cas_lockref
+            - lh_cas_rw_lock
+            - lh_empty
+            - lh_event_mutex
+            - lh_incdec_refcount
+            - lh_jvm_objectmonitor
+            - lh_osq_lock
+            - lh_queued_spinlock
+            - lh_swap_mutex
+            - lh_tbb_spin_rw_mutex
+            - lh_ticket_spinlock
+          cmd_aarch64: [lh_hybrid_spinlock, lh_hybrid_spinlock_fastdequeue]
+          cmd_x86_64:
+          t: [1, 0]
+          a: 100
+          c: [0ns, 50ns]
+          p: [0ns, 50ns]
+
+        - cmd: lh_osq_lock
+          t: [1, 0]
+          a: 100
+          c: 50ns
+          p: 0ns
+          o: lstopo
+          extra:
+              u: 10
+              s: 2
+
+        - cmd: lh_tbb_spin_rw_mutex
+          t: [1, 0]
+          a: 100
+          c: 50ns
+          p: 0ns
+          i: 1
+          o: '0:1:2:3'
+          extra:
+              r: 4
+              m: 1
diff --git a/benchmarks/lockhammer/scripts/runall.sh b/benchmarks/lockhammer/scripts/runall.sh
@@ -27,27 +27,4 @@
 # OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 # IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-./sweep.sh incdec_refcount 0 0 > incdec_refcount_0_0_$HOSTNAME.csv
-./sweep.sh cas_lockref 0 0 > cas_lockref_0_0_$HOSTNAME.csv
-./sweep.sh cas_lockref 2000 1000 > cas_lockref_2000_1000_$HOSTNAME.csv
-./sweep.sh ticket_spinlock 0 0 > ticket_spinlock_0_0_$HOSTNAME.csv
-./sweep.sh ticket_spinlock 1000 5000 > ticket_spinlock_1000_5000_$HOSTNAME.csv
-./sweep.sh queued_spinlock 0 0 > queued_spinlock_0_0_$HOSTNAME.csv
-./sweep.sh queued_spinlock 1000 5000 > queued_spinlock_1000_5000_$HOSTNAME.csv
-./sweep.sh event_mutex 0 0 > event_mutex_0_0_$HOSTNAME.csv
-./sweep.sh event_mutex 1000 5000 > event_mutex_1000_5000_$HOSTNAME.csv
-./sweep.sh cas_event_mutex 0 0 > cas_event_mutex_0_0_$HOSTNAME.csv
-./sweep.sh cas_event_mutex 1000 5000 > cas_event_mutex_1000_5000_$HOSTNAME.csv
-./sweep.sh cas_rw_lock 0 0 > cas_rw_lock_0_0_$HOSTNAME.csv
-./sweep.sh cas_rw_lock 2000 1000 > cas_rw_lock_2000_1000_$HOSTNAME.csv
-./sweep.sh hybrid_spinlock 0 0 > hybrid_spinlock_0_0_$HOSTNAME.csv
-./sweep.sh hybrid_spinlock 1000 5000 > hybrid_spinlock_1000_5000_$HOSTNAME.csv
-./sweep.sh hybrid_spinlock_fastdequeue 0 0 > hybrid_spinlock_fastdequeue_0_0_$HOSTNAME.csv
-./sweep.sh hybrid_spinlock_fastdequeue 1000 5000 > hybrid_spinlock_fastdequeue_1000_5000_$HOSTNAME.csv
-./sweep.sh empty 0 0 > empty_0_0_$HOSTNAME.csv
-./sweep.sh jvm_objectmonitor 0 0 > jvm_objectmonitor_0_0_$HOSTNAME.csv
-./sweep.sh jvm_objectmonitor 1000 5000 > jvm_objectmonitor_1000_5000_$HOSTNAME.csv
-./sweep.sh swap_mutex 0 0 > swap_mutex_0_0_$HOSTNAME.csv
-./sweep.sh swap_mutex 1000 5000 > swap_mutex_1000_5000_$HOSTNAME.csv
-./sweep.sh spin_rw_mutex 0 0 > spin_rw_mutex_0_0_$HOSTNAME.csv
-./sweep.sh spin_rw_mutex 1000 5000 > spin_rw_mutex_1000_5000_$HOSTNAME.csv
+nohup sudo ./test_lockhammer.py lh_sweeptest_cfg.yaml &
diff --git a/benchmarks/lockhammer/scripts/runall_obsolete.sh b/benchmarks/lockhammer/scripts/runall_obsolete.sh
@@ -0,0 +1,53 @@
+#!/bin/bash
+
+# Copyright (c) 2017, The Linux Foundation. All rights reserved.
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#     * Redistributions of source code must retain the above copyright
+#       notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+#       copyright notice, this list of conditions and the following
+#       disclaimer in the documentation and/or other materials provided
+#       with the distribution.
+#     * Neither the name of The Linux Foundation nor the names of its
+#       contributors may be used to endorse or promote products derived
+#       from this software without specific prior written permission.
+# 
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+./sweep.sh incdec_refcount 0 0 > incdec_refcount_0_0_$HOSTNAME.csv
+./sweep.sh cas_lockref 0 0 > cas_lockref_0_0_$HOSTNAME.csv
+./sweep.sh cas_lockref 2000 1000 > cas_lockref_2000_1000_$HOSTNAME.csv
+./sweep.sh ticket_spinlock 0 0 > ticket_spinlock_0_0_$HOSTNAME.csv
+./sweep.sh ticket_spinlock 1000 5000 > ticket_spinlock_1000_5000_$HOSTNAME.csv
+./sweep.sh queued_spinlock 0 0 > queued_spinlock_0_0_$HOSTNAME.csv
+./sweep.sh queued_spinlock 1000 5000 > queued_spinlock_1000_5000_$HOSTNAME.csv
+./sweep.sh event_mutex 0 0 > event_mutex_0_0_$HOSTNAME.csv
+./sweep.sh event_mutex 1000 5000 > event_mutex_1000_5000_$HOSTNAME.csv
+./sweep.sh cas_event_mutex 0 0 > cas_event_mutex_0_0_$HOSTNAME.csv
+./sweep.sh cas_event_mutex 1000 5000 > cas_event_mutex_1000_5000_$HOSTNAME.csv
+./sweep.sh cas_rw_lock 0 0 > cas_rw_lock_0_0_$HOSTNAME.csv
+./sweep.sh cas_rw_lock 2000 1000 > cas_rw_lock_2000_1000_$HOSTNAME.csv
+./sweep.sh hybrid_spinlock 0 0 > hybrid_spinlock_0_0_$HOSTNAME.csv
+./sweep.sh hybrid_spinlock 1000 5000 > hybrid_spinlock_1000_5000_$HOSTNAME.csv
+./sweep.sh hybrid_spinlock_fastdequeue 0 0 > hybrid_spinlock_fastdequeue_0_0_$HOSTNAME.csv
+./sweep.sh hybrid_spinlock_fastdequeue 1000 5000 > hybrid_spinlock_fastdequeue_1000_5000_$HOSTNAME.csv
+./sweep.sh empty 0 0 > empty_0_0_$HOSTNAME.csv
+./sweep.sh jvm_objectmonitor 0 0 > jvm_objectmonitor_0_0_$HOSTNAME.csv
+./sweep.sh jvm_objectmonitor 1000 5000 > jvm_objectmonitor_1000_5000_$HOSTNAME.csv
+./sweep.sh swap_mutex 0 0 > swap_mutex_0_0_$HOSTNAME.csv
+./sweep.sh swap_mutex 1000 5000 > swap_mutex_1000_5000_$HOSTNAME.csv
+./sweep.sh spin_rw_mutex 0 0 > spin_rw_mutex_0_0_$HOSTNAME.csv
+./sweep.sh spin_rw_mutex 1000 5000 > spin_rw_mutex_1000_5000_$HOSTNAME.csv
diff --git a/benchmarks/lockhammer/scripts/test_lockhammer.py b/benchmarks/lockhammer/scripts/test_lockhammer.py
@@ -49,10 +49,11 @@
 
 
 # config file should be in the same directory of this script
-LH_CFG = "lh_test_cfg.yaml"
+LH_CFG = "lh_unittest_cfg.yaml"
 # lockhammer.c has these parameters
 LH_ARGU_LIST = ['t', 'a', 'c', 'p', 'i', 'o']
-
+# sh _timeout in seconds, default half an hour
+LH_TMOUT = 1800
 
 # python unittest framework container class
 @unittest.skipUnless(sys.platform.startswith('linux'), "require Linux")
@@ -75,7 +76,7 @@ def write_output(stdOut, logFile, paramList):
 def construct_func(fullCmd, fullArg, logFile):
     def test(self):
         cmdObj = sh.Command(fullCmd)
-        stdOut = str(cmdObj(fullArg))
+        stdOut = str(cmdObj(fullArg, _timeout=LH_TMOUT))
         write_output(stdOut, logFile, [str(datetime.datetime.now()), socket.getfqdn(), fullCmd] + fullArg)
         regEx = "[0-9]*, [0-9]*\.?[0-9]*, [0-9]*\.?[0-9]*, [0-9]*\.?[0-9]*, [0-9]*\.?[0-9]*"
         self.assertRegex(stdOut, regEx, "This program has not run to completion.")
@@ -144,9 +145,9 @@ def parse_lstopo():
         for line in out.splitlines():
             match = re.search("P#(\d+)", line.strip())
             if match:
-                result += (match.group(1) + ',')
+                result += (match.group(1) + ':')
     finally:
-        if result[-1] == ',':
+        if result[-1] == ':':
             result = result[:-1]
 
     # sample output for single-socket EPYC 7601 server:
@@ -272,7 +273,9 @@ def generate_unittest(className, lhCfg, testCfg):
     logFile = default_value(globalCfg, 'logfile', None)
     safeMode = default_value(unitCfg, 'safemode', True)
 
-    prepare_logfile(logFile)
+    if logFile:
+        logFile = socket.gethostname() + '_' + logFile
+        prepare_logfile(logFile)
 
     allCmd = []
     if isinstance(testCfg['cmd'], list):
@@ -326,7 +329,10 @@ def generate_sweeptest(className, lhCfg):
     lhCommand = default_value(sweepCfg, 'cmd', [])
     lhArgument = default_value(sweepCfg, 'argulist', [{}])
 
-    prepare_logfile(logFile)
+    if logFile:
+        logFile = socket.gethostname() + '_' + logFile
+        prepare_logfile(logFile)
+
     sweepList = calc_sweep_list(arguMax, skipSince, skipStep)
     append_arch_cmd(sweepCfg, lhCommand)
 
@@ -357,10 +363,14 @@ def build_sweep_test(lhCfg):
             sys.exit(2)
 
 
-# main function
+# test_lockhammer.py [local_yaml_config_filename]
 if __name__ == "__main__":
-    lhConfig = read_config(os.path.join(os.path.dirname(os.path.abspath(__file__)), LH_CFG))
+    if len(sys.argv) == 2:
+        lhConfigFullPath = os.path.join(os.path.dirname(os.path.abspath(__file__)), sys.argv[1])
+    else:
+        lhConfigFullPath = os.path.join(os.path.dirname(os.path.abspath(__file__)), LH_CFG)
+    lhConfig = read_config(lhConfigFullPath)
     pprint.pprint(lhConfig)
     build_unit_test(lhConfig)
     build_sweep_test(lhConfig)
-    unittest.main(verbosity=2)
+    unittest.main(argv=['first-arg-is-ignored'], verbosity=2)
diff --git a/benchmarks/lockhammer/src/lockhammer.c b/benchmarks/lockhammer/src/lockhammer.c
@@ -56,18 +56,17 @@ void* hmr(void *);
 
 void print_usage (char *invoc) {
     fprintf(stderr,
-            "Usage: %s\n\t[-t threads]\n\t[-a acquires per thread]\n\t"
+            "Usage: %s\n\t[-t <#> threads]\n\t[-a <#> acquires per thread]\n\t"
             "[-c <#>[ns | in] critical iterations measured in ns or (in)structions, "
             "if no suffix, assumes instructions]\n\t"
             "[-p <#>[ns | in] parallelizable iterations measured in ns or (in)structions, "
             "if no suffix, assumes (in)structions]\n\t"
-            "[-s safe-mode operation for running as non-root\n\t"
-            "[-i interleave value for thread pinning order, for example, 1 means "
-            "sequential increasing, 2 means pinning hyperthread of the same core first "
-            "before the next core.]\n\t"
-            "[-o arbitrary core pinning order separated by comma without space, command "
-            "lstopo can be used to deduce the correct order.]\n\t"
-            "[-- <test specific arguments>]\n", invoc);
+            "[-s safe-mode operation for running as non-root by reducing priority]\n\t"
+            "[-i <#> interleave value for SMT pinning, e.g. 1: core pinning / no SMT, "
+            "2: 2-way SMT pinning, 4: 4-way SMT pinning, may not work for multisocket]\n\t"
+            "[-o <#:#:#:#> arbitrary pinning order separated by colon without space, "
+            "command lstopo can be used to deduce the correct order]\n\t"
+            "[-- <more workload specific arguments>]\n", invoc);
 }
 
 int main(int argc, char** argv)
@@ -109,6 +108,9 @@ int main(int argc, char** argv)
                 fprintf(stderr, "ERROR: thread count must be positive.\n");
                 return 1;
             }
+            else if (optval == 0) {
+                optval = num_cores;
+            }
             else if (optval <= num_cores) {
                 args.nthrds = optval;
             }
@@ -175,19 +177,20 @@ int main(int argc, char** argv)
           case 'o':
             args.pinorder = calloc(num_cores, sizeof(int));
             if (args.pinorder == NULL) {
-                fprintf(stderr, "ERROR: Cannot allocate enough memory for pinorder structure.\n");
+                fprintf(stderr, "ERROR: cannot allocate enough memory for pinorder structure.\n");
                 return 1;
             }
-            csv = strtok(optarg, ",");
+            /* support both comma and colon as delimiter */
+            csv = strtok(optarg, ",:");
             for (int i = 0; i < num_cores && csv != NULL; ++i)
             {
                 optval = strtol(csv, (char **) NULL, 10);
-                if (optval >= 0 && optval < num_cores) {
-                    args.pinorder[i] = optval;
-                } else {
+                /* Some Arm systems may have core number larger than total cores number */
+                args.pinorder[i] = optval;
+                if (optval < 0 || optval > num_cores) {
                     fprintf(stderr, "WARNING: core number %ld is out of range.\n", optval);
                 }
-                csv = strtok(NULL, ",");
+                csv = strtok(NULL, ",:");
             }
             break;
           case 's':

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-CFLAGS=-g -O2 -I. -I./include -I../../ext/mysql/include -I../../ext/linux/include -I../../ext/tbb/include`
	`1`	`+override CFLAGS += -g -O3 -I. -I./include -I../../ext/mysql/include -I../../ext/linux/include -I../../ext/tbb/include`
`2`	`2`
`3`	`3`	`ifneq ($(DEBUG_LEVEL),)`
`4`	`4`	`ifeq ($(shell test $(DEBUG_LEVEL) -gt 0; echo $$?),0)`