# HG changeset patch # User Pierre-Yves David <pierre-yves.david@octobus.net> # Date 1575461406 -3600 # Wed Dec 04 13:10:06 2019 +0100 # Node ID 7b399f85cddd56a96402e624195ad9be5333f5bf # Parent c3f1b1fb065f9ddfb73aff2b2b756a763f05c17a workers: also benchmark work variation for commit diff --git a/asv_migrations/0003_cpus.py b/asv_migrations/0003_cpus.py new file mode 100644 --- /dev/null +++ b/asv_migrations/0003_cpus.py @@ -0,0 +1,12 @@ + +from asv import migrations + +class Migration(migrations.Migration): + + operations = [ + migrations.AddBenchParam( + name="max_worker_count", + values=[1, 2], + default=1, + targets=r"^simple_command.write.track_commit"), + ] diff --git a/benchmarks/basic_commands.py b/benchmarks/basic_commands.py --- a/benchmarks/basic_commands.py +++ b/benchmarks/basic_commands.py @@ -28,11 +28,12 @@ timeout = 300 - params = BaseTestSuite.params + [("create", "update")] - param_names = BaseTestSuite.param_names + ["mode"] + params = BaseTestSuite.params + [("create", "update")] + [(1, 2)] + param_names = BaseTestSuite.param_names + ["mode"] + ["max_worker_count"] @benchmark_name('simple_command.write.track_commit') @params_as_kwargs + @use_workers def track_commit(self, mode, **kwargs): timings = [] filename = None diff --git a/tests/test-smoke-test-python3.t b/tests/test-smoke-test-python3.t --- a/tests/test-smoke-test-python3.t +++ b/tests/test-smoke-test-python3.t @@ -140,45 +140,53 @@ [ 25.00%] --- Setting up utils:*ok (glob) [ 50.00%] -- Building for virtualenv-py3.7-pyyaml-HGMODULEPOLICYrust+c-HGWITHRUSTEXTcpython (?) [ 25.00%] --- simple_command.write.track_commit ok - \[ 25.00%\] --- ============== ========================= =============================== ======================== ======================= ===================== ========================== ============================ ====================== ========================== ======== =+ (re) - repo repo-format-compression repo-format-compression-level repo-format-copies-sdc repo-format-dotencode repo-format-fncache repo-format-generaldelta repo-format-plain-cl-delta repo-format-sidedata repo-format-sparserevlog mode + (re) - -------------- ------------------------- ------------------------------- ------------------------ ----------------------- --------------------- -------------------------- ---------------------------- ---------------------- -------------------------- -------- -+ (re) - smoke-test-A zlib default False True True True True False True create +\d+\.\d+ * (re) - smoke-test-A zlib default False True True True True False True update +\d+\.\d+ * (re) - ============== ========================= =============================== ======================== ======================= ===================== ========================== ============================ ====================== ========================== ======== =+ (re) + \[ 25.00%\] --- ============== ========================= =============================== ======================== ======================= ===================== ========================== ============================ ====================== ========================== ======== ================== =+ (re) + repo repo-format-compression repo-format-compression-level repo-format-copies-sdc repo-format-dotencode repo-format-fncache repo-format-generaldelta repo-format-plain-cl-delta repo-format-sidedata repo-format-sparserevlog mode max_worker_count + (re) + -------------- ------------------------- ------------------------------- ------------------------ ----------------------- --------------------- -------------------------- ---------------------------- ---------------------- -------------------------- -------- ------------------ -+ (re) + smoke-test-A zlib default False True True True True False True create 1 +\d+\.\d+ * (re) + smoke-test-A zlib default False True True True True False True create 2 +\d+\.\d+ * (re) + smoke-test-A zlib default False True True True True False True update 1 +\d+\.\d+ * (re) + smoke-test-A zlib default False True True True True False True update 2 +\d+\.\d+ * (re) + ============== ========================= =============================== ======================== ======================= ===================== ========================== ============================ ====================== ========================== ======== ================== =+ (re) [ 25.00%] -- Building for virtualenv-py2.7-pyyaml-HGMODULEPOLICYc-HGWITHRUSTEXTcpython [ 25.00%] -- Benchmarking virtualenv-py2.7-pyyaml-HGMODULEPOLICYc-HGWITHRUSTEXTcpython [ 50.00%] --- Setting up utils:* ok (glob) [ 50.00%] --- simple_command.write.track_commit ok - \[ 50.00%\] --- ============== ========================= =============================== ======================== ======================= ===================== ========================== ============================ ====================== ========================== ======== =+ (re) - repo repo-format-compression repo-format-compression-level repo-format-copies-sdc repo-format-dotencode repo-format-fncache repo-format-generaldelta repo-format-plain-cl-delta repo-format-sidedata repo-format-sparserevlog mode + (re) - -------------- ------------------------- ------------------------------- ------------------------ ----------------------- --------------------- -------------------------- ---------------------------- ---------------------- -------------------------- -------- -+ (re) - smoke-test-A zlib default False True True True True False True create +\d+\.\d+ * (re) - smoke-test-A zlib default False True True True True False True update +\d+\.\d+ * (re) - ============== ========================= =============================== ======================== ======================= ===================== ========================== ============================ ====================== ========================== ======== =+ (re) + \[ 50.00%\] --- ============== ========================= =============================== ======================== ======================= ===================== ========================== ============================ ====================== ========================== ======== ================== =+ (re) + repo repo-format-compression repo-format-compression-level repo-format-copies-sdc repo-format-dotencode repo-format-fncache repo-format-generaldelta repo-format-plain-cl-delta repo-format-sidedata repo-format-sparserevlog mode max_worker_count + (re) + -------------- ------------------------- ------------------------------- ------------------------ ----------------------- --------------------- -------------------------- ---------------------------- ---------------------- -------------------------- -------- ------------------ -+ (re) + smoke-test-A zlib default False True True True True False True create 1 +\d+\.\d+ * (re) + smoke-test-A zlib default False True True True True False True create 2 +\d+\.\d+ * (re) + smoke-test-A zlib default False True True True True False True update 1 +\d+\.\d+ * (re) + smoke-test-A zlib default False True True True True False True update 2 +\d+\.\d+ * (re) + ============== ========================= =============================== ======================== ======================= ===================== ========================== ============================ ====================== ========================== ======== ================== =+ (re) [ 50.00%] -- Building for virtualenv-py3.7-pyyaml-HGMODULEPOLICYrust+c-HGWITHRUSTEXTcpython (?) [ 50.00%] -- Benchmarking virtualenv-py3.7-pyyaml-HGMODULEPOLICYrust+c-HGWITHRUSTEXTcpython [ 75.00%] --- Setting up utils:* ok (glob) [ 75.00%] --- simple_command.write.track_commit ok - \[ 75.00%\] --- ============== ========================= =============================== ======================== ======================= ===================== ========================== ============================ ====================== ========================== ======== =+ (re) - repo repo-format-compression repo-format-compression-level repo-format-copies-sdc repo-format-dotencode repo-format-fncache repo-format-generaldelta repo-format-plain-cl-delta repo-format-sidedata repo-format-sparserevlog mode + (re) - -------------- ------------------------- ------------------------------- ------------------------ ----------------------- --------------------- -------------------------- ---------------------------- ---------------------- -------------------------- -------- -+ (re) - smoke-test-A zlib default False True True True True False True create +\d+\.\d+ * (re) - smoke-test-A zlib default False True True True True False True update +\d+\.\d+ * (re) - ============== ========================= =============================== ======================== ======================= ===================== ========================== ============================ ====================== ========================== ======== =+ (re) + \[ 75.00%\] --- ============== ========================= =============================== ======================== ======================= ===================== ========================== ============================ ====================== ========================== ======== ================== =+ (re) + repo repo-format-compression repo-format-compression-level repo-format-copies-sdc repo-format-dotencode repo-format-fncache repo-format-generaldelta repo-format-plain-cl-delta repo-format-sidedata repo-format-sparserevlog mode max_worker_count + (re) + -------------- ------------------------- ------------------------------- ------------------------ ----------------------- --------------------- -------------------------- ---------------------------- ---------------------- -------------------------- -------- ------------------ -+ (re) + smoke-test-A zlib default False True True True True False True create 1 +\d+\.\d+ * (re) + smoke-test-A zlib default False True True True True False True create 2 +\d+\.\d+ * (re) + smoke-test-A zlib default False True True True True False True update 1 +\d+\.\d+ * (re) + smoke-test-A zlib default False True True True True False True update 2 +\d+\.\d+ * (re) + ============== ========================= =============================== ======================== ======================= ===================== ========================== ============================ ====================== ========================== ======== ================== =+ (re) [ 75.00%] -- Building for virtualenv-py3.7-pyyaml-HGMODULEPOLICYc-HGWITHRUSTEXTcpython [ 75.00%] -- Benchmarking virtualenv-py3.7-pyyaml-HGMODULEPOLICYc-HGWITHRUSTEXTcpython [100.00%] --- Setting up utils:* ok (glob) [100.00%] --- simple_command.write.track_commit ok - \[100.00%\] --- ============== ========================= =============================== ======================== ======================= ===================== ========================== ============================ ====================== ========================== ======== =+ (re) - repo repo-format-compression repo-format-compression-level repo-format-copies-sdc repo-format-dotencode repo-format-fncache repo-format-generaldelta repo-format-plain-cl-delta repo-format-sidedata repo-format-sparserevlog mode + (re) - -------------- ------------------------- ------------------------------- ------------------------ ----------------------- --------------------- -------------------------- ---------------------------- ---------------------- -------------------------- -------- -+ (re) - smoke-test-A zlib default False True True True True False True create +\d+\.\d+ * (re) - smoke-test-A zlib default False True True True True False True update +\d+\.\d+ * (re) - ============== ========================= =============================== ======================== ======================= ===================== ========================== ============================ ====================== ========================== ======== =+ (re) + \[100.00%\] --- ============== ========================= =============================== ======================== ======================= ===================== ========================== ============================ ====================== ========================== ======== ================== =+ (re) + repo repo-format-compression repo-format-compression-level repo-format-copies-sdc repo-format-dotencode repo-format-fncache repo-format-generaldelta repo-format-plain-cl-delta repo-format-sidedata repo-format-sparserevlog mode max_worker_count + (re) + -------------- ------------------------- ------------------------------- ------------------------ ----------------------- --------------------- -------------------------- ---------------------------- ---------------------- -------------------------- -------- ------------------ -+ (re) + smoke-test-A zlib default False True True True True False True create 1 +\d+\.\d+ * (re) + smoke-test-A zlib default False True True True True False True create 2 +\d+\.\d+ * (re) + smoke-test-A zlib default False True True True True False True update 1 +\d+\.\d+ * (re) + smoke-test-A zlib default False True True True True False True update 2 +\d+\.\d+ * (re) + ============== ========================= =============================== ======================== ======================= ===================== ========================== ============================ ====================== ========================== ======== ================== =+ (re) + ['./lib/before-check.sh'] + ['asv', 'run', '--launch-method', 'spawn', '--skip-existing-successful', '8fda98a68427', '-b', 'track_commit', '--no-pull'] diff --git a/tests/test-smoke-test.t b/tests/test-smoke-test.t --- a/tests/test-smoke-test.t +++ b/tests/test-smoke-test.t @@ -209,53 +209,69 @@ [ 0.00%] -- Benchmarking virtualenv-py2.7-pyyaml-HGMODULEPOLICYrust+c [ 25.00%] --- Setting up utils:* ok (glob) [ 25.00%] --- simple_command.write.track_commit ok - \[ 25.00%\] --- ============== ========================= =============================== ======================== ======================= ===================== ========================== ============================ ====================== ========================== ======== =+ (re) - repo repo-format-compression repo-format-compression-level repo-format-copies-sdc repo-format-dotencode repo-format-fncache repo-format-generaldelta repo-format-plain-cl-delta repo-format-sidedata repo-format-sparserevlog mode + (re) - -------------- ------------------------- ------------------------------- ------------------------ ----------------------- --------------------- -------------------------- ---------------------------- ---------------------- -------------------------- -------- ----- - smoke-test-A zlib default False True True True True False True create n/a - smoke-test-A zlib default False True True True True False True update n/a - smoke-test-B zlib default False True True True True False True create n/a - smoke-test-B zlib default False True True True True False True update n/a - ============== ========================= =============================== ======================== ======================= ===================== ========================== ============================ ====================== ========================== ======== =+ (re) + \[ 25.00%\] --- ============== ========================= =============================== ======================== ======================= ===================== ========================== ============================ ====================== ========================== ======== ================== =+ (re) + repo repo-format-compression repo-format-compression-level repo-format-copies-sdc repo-format-dotencode repo-format-fncache repo-format-generaldelta repo-format-plain-cl-delta repo-format-sidedata repo-format-sparserevlog mode max_worker_count + (re) + -------------- ------------------------- ------------------------------- ------------------------ ----------------------- --------------------- -------------------------- ---------------------------- ---------------------- -------------------------- -------- ------------------ ----- + smoke-test-A zlib default False True True True True False True create 1 n/a + smoke-test-A zlib default False True True True True False True create 2 n/a + smoke-test-A zlib default False True True True True False True update 1 n/a + smoke-test-A zlib default False True True True True False True update 2 n/a + smoke-test-B zlib default False True True True True False True create 1 n/a + smoke-test-B zlib default False True True True True False True create 2 n/a + smoke-test-B zlib default False True True True True False True update 1 n/a + smoke-test-B zlib default False True True True True False True update 2 n/a + ============== ========================= =============================== ======================== ======================= ===================== ========================== ============================ ====================== ========================== ======== ================== =+ (re) [ 25.00%] -- Building for virtualenv-py2.7-pyyaml-HGMODULEPOLICYc-HGWITHRUSTEXTcpython [ 25.00%] -- Benchmarking virtualenv-py2.7-pyyaml-HGMODULEPOLICYc-HGWITHRUSTEXTcpython [ 50.00%] --- Setting up utils:* ok (glob) [ 50.00%] --- simple_command.write.track_commit ok - \[ 50.00%\] --- ============== ========================= =============================== ======================== ======================= ===================== ========================== ============================ ====================== ========================== ======== =+ (re) - repo repo-format-compression repo-format-compression-level repo-format-copies-sdc repo-format-dotencode repo-format-fncache repo-format-generaldelta repo-format-plain-cl-delta repo-format-sidedata repo-format-sparserevlog mode + (re) - -------------- ------------------------- ------------------------------- ------------------------ ----------------------- --------------------- -------------------------- ---------------------------- ---------------------- -------------------------- -------- -+ (re) - smoke-test-A zlib default False True True True True False True create +\d+\.\d+ * (re) - smoke-test-A zlib default False True True True True False True update +\d+\.\d+ * (re) - smoke-test-B zlib default False True True True True False True create +\d+\.\d+ * (re) - smoke-test-B zlib default False True True True True False True update +\d+\.\d+ * (re) - ============== ========================= =============================== ======================== ======================= ===================== ========================== ============================ ====================== ========================== ======== =+ (re) + \[ 50.00%\] --- ============== ========================= =============================== ======================== ======================= ===================== ========================== ============================ ====================== ========================== ======== ================== =+ (re) + repo repo-format-compression repo-format-compression-level repo-format-copies-sdc repo-format-dotencode repo-format-fncache repo-format-generaldelta repo-format-plain-cl-delta repo-format-sidedata repo-format-sparserevlog mode max_worker_count + (re) + -------------- ------------------------- ------------------------------- ------------------------ ----------------------- --------------------- -------------------------- ---------------------------- ---------------------- -------------------------- -------- ------------------ -+ (re) + smoke-test-A zlib default False True True True True False True create 1 +\d+\.\d+ * (re) + smoke-test-A zlib default False True True True True False True create 2 +\d+\.\d+ * (re) + smoke-test-A zlib default False True True True True False True update 1 +\d+\.\d+ * (re) + smoke-test-A zlib default False True True True True False True update 2 +\d+\.\d+ * (re) + smoke-test-B zlib default False True True True True False True create 1 +\d+\.\d+ * (re) + smoke-test-B zlib default False True True True True False True create 2 +\d+\.\d+ * (re) + smoke-test-B zlib default False True True True True False True update 1 +\d+\.\d+ * (re) + smoke-test-B zlib default False True True True True False True update 2 +\d+\.\d+ * (re) + ============== ========================= =============================== ======================== ======================= ===================== ========================== ============================ ====================== ========================== ======== ================== =+ (re) [ 50.00%] -- Building for virtualenv-py3.7-pyyaml-HGMODULEPOLICYrust+c-HGWITHRUSTEXTcpython [ 50.00%] -- Benchmarking virtualenv-py3.7-pyyaml-HGMODULEPOLICYrust+c-HGWITHRUSTEXTcpython [ 75.00%] --- Setting up utils:* ok (glob) [ 75.00%] --- simple_command.write.track_commit ok - \[ 75.00%\] --- ============== ========================= =============================== ======================== ======================= ===================== ========================== ============================ ====================== ========================== ======== =+ (re) - repo repo-format-compression repo-format-compression-level repo-format-copies-sdc repo-format-dotencode repo-format-fncache repo-format-generaldelta repo-format-plain-cl-delta repo-format-sidedata repo-format-sparserevlog mode + (re) - -------------- ------------------------- ------------------------------- ------------------------ ----------------------- --------------------- -------------------------- ---------------------------- ---------------------- -------------------------- -------- ----- - smoke-test-A zlib default False True True True True False True create n/a - smoke-test-A zlib default False True True True True False True update n/a - smoke-test-B zlib default False True True True True False True create n/a - smoke-test-B zlib default False True True True True False True update n/a - ============== ========================= =============================== ======================== ======================= ===================== ========================== ============================ ====================== ========================== ======== =+ (re) + \[ 75.00%\] --- ============== ========================= =============================== ======================== ======================= ===================== ========================== ============================ ====================== ========================== ======== ================== =+ (re) + repo repo-format-compression repo-format-compression-level repo-format-copies-sdc repo-format-dotencode repo-format-fncache repo-format-generaldelta repo-format-plain-cl-delta repo-format-sidedata repo-format-sparserevlog mode max_worker_count + (re) + -------------- ------------------------- ------------------------------- ------------------------ ----------------------- --------------------- -------------------------- ---------------------------- ---------------------- -------------------------- -------- ------------------ ----- + smoke-test-A zlib default False True True True True False True create 1 n/a + smoke-test-A zlib default False True True True True False True create 2 n/a + smoke-test-A zlib default False True True True True False True update 1 n/a + smoke-test-A zlib default False True True True True False True update 2 n/a + smoke-test-B zlib default False True True True True False True create 1 n/a + smoke-test-B zlib default False True True True True False True create 2 n/a + smoke-test-B zlib default False True True True True False True update 1 n/a + smoke-test-B zlib default False True True True True False True update 2 n/a + ============== ========================= =============================== ======================== ======================= ===================== ========================== ============================ ====================== ========================== ======== ================== =+ (re) [ 75.00%] -- Building for virtualenv-py3.7-pyyaml-HGMODULEPOLICYc-HGWITHRUSTEXTcpython [ 75.00%] -- Benchmarking virtualenv-py3.7-pyyaml-HGMODULEPOLICYc-HGWITHRUSTEXTcpython [100.00%] --- Setting up utils:* ok (glob) [100.00%] --- simple_command.write.track_commit ok - \[100.00%\] --- ============== ========================= =============================== ======================== ======================= ===================== ========================== ============================ ====================== ========================== ======== =+ (re) - repo repo-format-compression repo-format-compression-level repo-format-copies-sdc repo-format-dotencode repo-format-fncache repo-format-generaldelta repo-format-plain-cl-delta repo-format-sidedata repo-format-sparserevlog mode + (re) - -------------- ------------------------- ------------------------------- ------------------------ ----------------------- --------------------- -------------------------- ---------------------------- ---------------------- -------------------------- -------- ----- - smoke-test-A zlib default False True True True True False True create n/a - smoke-test-A zlib default False True True True True False True update n/a - smoke-test-B zlib default False True True True True False True create n/a - smoke-test-B zlib default False True True True True False True update n/a - ============== ========================= =============================== ======================== ======================= ===================== ========================== ============================ ====================== ========================== ======== =+ (re) + \[100.00%\] --- ============== ========================= =============================== ======================== ======================= ===================== ========================== ============================ ====================== ========================== ======== ================== =+ (re) + repo repo-format-compression repo-format-compression-level repo-format-copies-sdc repo-format-dotencode repo-format-fncache repo-format-generaldelta repo-format-plain-cl-delta repo-format-sidedata repo-format-sparserevlog mode max_worker_count + (re) + -------------- ------------------------- ------------------------------- ------------------------ ----------------------- --------------------- -------------------------- ---------------------------- ---------------------- -------------------------- -------- ------------------ ----- + smoke-test-A zlib default False True True True True False True create 1 n/a + smoke-test-A zlib default False True True True True False True create 2 n/a + smoke-test-A zlib default False True True True True False True update 1 n/a + smoke-test-A zlib default False True True True True False True update 2 n/a + smoke-test-B zlib default False True True True True False True create 1 n/a + smoke-test-B zlib default False True True True True False True create 2 n/a + smoke-test-B zlib default False True True True True False True update 1 n/a + smoke-test-B zlib default False True True True True False True update 2 n/a + ============== ========================= =============================== ======================== ======================= ===================== ========================== ============================ ====================== ========================== ======== ================== =+ (re) + ['./lib/before-check.sh'] + ['asv', 'run', '--launch-method', 'spawn', '--skip-existing-successful', 'fe3ca1e6', '-b', 'track_commit', '--no-pull']