From 0554703bed88d1656e1784b5b830939177fd0175 Mon Sep 17 00:00:00 2001 From: Joakim Hassila Date: Fri, 4 Oct 2024 12:33:23 +0200 Subject: [PATCH] Add support for new thresholds commands and fix a few bugs related to threshold checking --- .../Thresholds/Basic.Basic.p90.json | 5 ---- .../Basic.InstructionCount.p90.json | 3 -- .../Benchmarks/Thresholds/Basic.Noop.p90.json | 5 ---- .../Thresholds/Basic.Noop2.p90.json | 8 ----- .../Basic.Parameterized_(count:_1).p90.json | 8 ----- .../Basic.Parameterized_(count:_16).p90.json | 8 ----- .../Basic.Parameterized_(count:_2).p90.json | 8 ----- .../Basic.Parameterized_(count:_32).p90.json | 8 ----- .../Basic.Parameterized_(count:_4).p90.json | 8 ----- .../Basic.Parameterized_(count:_8).p90.json | 8 ----- .../Basic.Scaled_metrics_K.p90.json | 29 ------------------ .../Basic.Scaled_metrics_M.p90.json | 30 ------------------- .../Basic.Scaled_metrics_One.p90.json | 29 ------------------ .../Thresholds/Basic.SetupTeardown.p90.json | 8 ----- .../Thresholds/Basic.SetupTeardown2.p90.json | 8 ----- .../Thresholds/Basic.SetupTeardown3.p90.json | 8 ----- .../Thresholds/Basic.SetupTeardown4.p90.json | 8 ----- .../Thresholds/Basic.SetupTeardown5.p90.json | 8 ----- .../Thresholds/Basic.SetupTeardown6.p90.json | 8 ----- .../Thresholds/Basic.Statistics.p90.json | 7 ----- 20 files changed, 212 deletions(-) delete mode 100644 Benchmarks/Benchmarks/Thresholds/Basic.Basic.p90.json delete mode 100644 Benchmarks/Benchmarks/Thresholds/Basic.InstructionCount.p90.json delete mode 100644 Benchmarks/Benchmarks/Thresholds/Basic.Noop.p90.json delete mode 100644 Benchmarks/Benchmarks/Thresholds/Basic.Noop2.p90.json delete mode 100644 Benchmarks/Benchmarks/Thresholds/Basic.Parameterized_(count:_1).p90.json delete mode 100644 Benchmarks/Benchmarks/Thresholds/Basic.Parameterized_(count:_16).p90.json delete mode 100644 Benchmarks/Benchmarks/Thresholds/Basic.Parameterized_(count:_2).p90.json delete mode 100644 Benchmarks/Benchmarks/Thresholds/Basic.Parameterized_(count:_32).p90.json delete mode 100644 Benchmarks/Benchmarks/Thresholds/Basic.Parameterized_(count:_4).p90.json delete mode 100644 Benchmarks/Benchmarks/Thresholds/Basic.Parameterized_(count:_8).p90.json delete mode 100644 Benchmarks/Benchmarks/Thresholds/Basic.Scaled_metrics_K.p90.json delete mode 100644 Benchmarks/Benchmarks/Thresholds/Basic.Scaled_metrics_M.p90.json delete mode 100644 Benchmarks/Benchmarks/Thresholds/Basic.Scaled_metrics_One.p90.json delete mode 100644 Benchmarks/Benchmarks/Thresholds/Basic.SetupTeardown.p90.json delete mode 100644 Benchmarks/Benchmarks/Thresholds/Basic.SetupTeardown2.p90.json delete mode 100644 Benchmarks/Benchmarks/Thresholds/Basic.SetupTeardown3.p90.json delete mode 100644 Benchmarks/Benchmarks/Thresholds/Basic.SetupTeardown4.p90.json delete mode 100644 Benchmarks/Benchmarks/Thresholds/Basic.SetupTeardown5.p90.json delete mode 100644 Benchmarks/Benchmarks/Thresholds/Basic.SetupTeardown6.p90.json delete mode 100644 Benchmarks/Benchmarks/Thresholds/Basic.Statistics.p90.json diff --git a/Benchmarks/Benchmarks/Thresholds/Basic.Basic.p90.json b/Benchmarks/Benchmarks/Thresholds/Basic.Basic.p90.json deleted file mode 100644 index 0aa3acc4..00000000 --- a/Benchmarks/Benchmarks/Thresholds/Basic.Basic.p90.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "instructions" : 667, - "throughput" : 2000895, - "wallClock" : 583 -} \ No newline at end of file diff --git a/Benchmarks/Benchmarks/Thresholds/Basic.InstructionCount.p90.json b/Benchmarks/Benchmarks/Thresholds/Basic.InstructionCount.p90.json deleted file mode 100644 index d53191f4..00000000 --- a/Benchmarks/Benchmarks/Thresholds/Basic.InstructionCount.p90.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "instructions" : 42532863 -} \ No newline at end of file diff --git a/Benchmarks/Benchmarks/Thresholds/Basic.Noop.p90.json b/Benchmarks/Benchmarks/Thresholds/Basic.Noop.p90.json deleted file mode 100644 index 7ee90c92..00000000 --- a/Benchmarks/Benchmarks/Thresholds/Basic.Noop.p90.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "instructions" : 667, - "mallocCountTotal" : 0, - "wallClock" : 584 -} \ No newline at end of file diff --git a/Benchmarks/Benchmarks/Thresholds/Basic.Noop2.p90.json b/Benchmarks/Benchmarks/Thresholds/Basic.Noop2.p90.json deleted file mode 100644 index 50629ccb..00000000 --- a/Benchmarks/Benchmarks/Thresholds/Basic.Noop2.p90.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "instructions" : 891, - "objectAllocCount" : 0, - "releaseCount" : 2, - "retainCount" : 2, - "retainReleaseDelta" : 0, - "wallClock" : 584 -} \ No newline at end of file diff --git a/Benchmarks/Benchmarks/Thresholds/Basic.Parameterized_(count:_1).p90.json b/Benchmarks/Benchmarks/Thresholds/Basic.Parameterized_(count:_1).p90.json deleted file mode 100644 index 6a9de85f..00000000 --- a/Benchmarks/Benchmarks/Thresholds/Basic.Parameterized_(count:_1).p90.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "cpuTotal" : 2791, - "instructions" : 1567, - "mallocCountTotal" : 0, - "peakMemoryResident" : 12042240, - "throughput" : 1600511, - "wallClock" : 667 -} \ No newline at end of file diff --git a/Benchmarks/Benchmarks/Thresholds/Basic.Parameterized_(count:_16).p90.json b/Benchmarks/Benchmarks/Thresholds/Basic.Parameterized_(count:_16).p90.json deleted file mode 100644 index 61b7d259..00000000 --- a/Benchmarks/Benchmarks/Thresholds/Basic.Parameterized_(count:_16).p90.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "cpuTotal" : 3417, - "instructions" : 12319, - "mallocCountTotal" : 0, - "peakMemoryResident" : 12091392, - "throughput" : 923647, - "wallClock" : 1375 -} \ No newline at end of file diff --git a/Benchmarks/Benchmarks/Thresholds/Basic.Parameterized_(count:_2).p90.json b/Benchmarks/Benchmarks/Thresholds/Basic.Parameterized_(count:_2).p90.json deleted file mode 100644 index 72425d2b..00000000 --- a/Benchmarks/Benchmarks/Thresholds/Basic.Parameterized_(count:_2).p90.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "cpuTotal" : 2917, - "instructions" : 2089, - "mallocCountTotal" : 0, - "peakMemoryResident" : 12042240, - "throughput" : 1600511, - "wallClock" : 709 -} \ No newline at end of file diff --git a/Benchmarks/Benchmarks/Thresholds/Basic.Parameterized_(count:_32).p90.json b/Benchmarks/Benchmarks/Thresholds/Basic.Parameterized_(count:_32).p90.json deleted file mode 100644 index 52179368..00000000 --- a/Benchmarks/Benchmarks/Thresholds/Basic.Parameterized_(count:_32).p90.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "cpuTotal" : 4085, - "instructions" : 20655, - "mallocCountTotal" : 0, - "peakMemoryResident" : 12025856, - "throughput" : 558591, - "wallClock" : 1917 -} \ No newline at end of file diff --git a/Benchmarks/Benchmarks/Thresholds/Basic.Parameterized_(count:_4).p90.json b/Benchmarks/Benchmarks/Thresholds/Basic.Parameterized_(count:_4).p90.json deleted file mode 100644 index a06291cd..00000000 --- a/Benchmarks/Benchmarks/Thresholds/Basic.Parameterized_(count:_4).p90.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "cpuTotal" : 3043, - "instructions" : 6067, - "mallocCountTotal" : 0, - "peakMemoryResident" : 12042240, - "throughput" : 1413119, - "wallClock" : 958 -} \ No newline at end of file diff --git a/Benchmarks/Benchmarks/Thresholds/Basic.Parameterized_(count:_8).p90.json b/Benchmarks/Benchmarks/Thresholds/Basic.Parameterized_(count:_8).p90.json deleted file mode 100644 index b6cd1345..00000000 --- a/Benchmarks/Benchmarks/Thresholds/Basic.Parameterized_(count:_8).p90.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "cpuTotal" : 3209, - "instructions" : 8151, - "mallocCountTotal" : 0, - "peakMemoryResident" : 12075008, - "throughput" : 1201151, - "wallClock" : 1084 -} \ No newline at end of file diff --git a/Benchmarks/Benchmarks/Thresholds/Basic.Scaled_metrics_K.p90.json b/Benchmarks/Benchmarks/Thresholds/Basic.Scaled_metrics_K.p90.json deleted file mode 100644 index 7e6342ae..00000000 --- a/Benchmarks/Benchmarks/Thresholds/Basic.Scaled_metrics_K.p90.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "CustomMetricOne" : 897, - "CustomMetricTwo" : 895999, - "allocatedResidentMemory" : 16515072, - "contextSwitches" : 0, - "cpuSystem" : 2291, - "cpuTotal" : 41855, - "cpuUser" : 39423, - "instructions" : 617983, - "mallocCountLarge" : 0, - "mallocCountSmall" : 0, - "mallocCountTotal" : 0, - "memoryLeaked" : 0, - "objectAllocCount" : 0, - "peakMemoryResident" : 16039936, - "peakMemoryResidentDelta" : 376832, - "peakMemoryVirtual" : 420477075456, - "readBytesPhysical" : 0, - "releaseCount" : 8, - "retainCount" : 8, - "retainReleaseDelta" : 0, - "syscalls" : 2, - "threads" : 3, - "threadsRunning" : 2, - "throughput" : 26671, - "wallClock" : 39903, - "writeBytesPhysical" : 0, - "writeSyscalls" : 0 -} \ No newline at end of file diff --git a/Benchmarks/Benchmarks/Thresholds/Basic.Scaled_metrics_M.p90.json b/Benchmarks/Benchmarks/Thresholds/Basic.Scaled_metrics_M.p90.json deleted file mode 100644 index e451fff9..00000000 --- a/Benchmarks/Benchmarks/Thresholds/Basic.Scaled_metrics_M.p90.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "CustomMetricOne" : 949, - "CustomMetricThree" : 817889279, - "CustomMetricTwo" : 680959, - "allocatedResidentMemory" : 16728064, - "contextSwitches" : 15, - "cpuSystem" : 325119, - "cpuTotal" : 38371327, - "cpuUser" : 37978111, - "instructions" : 611233498, - "mallocCountLarge" : 0, - "mallocCountSmall" : 0, - "mallocCountTotal" : 0, - "memoryLeaked" : 0, - "objectAllocCount" : 0, - "peakMemoryResident" : 16285696, - "peakMemoryResidentDelta" : 376832, - "peakMemoryVirtual" : 420477288448, - "readBytesPhysical" : 0, - "releaseCount" : 11, - "retainCount" : 11, - "retainReleaseDelta" : 0, - "syscalls" : 52, - "threads" : 3, - "threadsRunning" : 2, - "throughput" : 27, - "wallClock" : 38338559, - "writeBytesPhysical" : 0, - "writeSyscalls" : 0 -} \ No newline at end of file diff --git a/Benchmarks/Benchmarks/Thresholds/Basic.Scaled_metrics_One.p90.json b/Benchmarks/Benchmarks/Thresholds/Basic.Scaled_metrics_One.p90.json deleted file mode 100644 index d95f81c9..00000000 --- a/Benchmarks/Benchmarks/Thresholds/Basic.Scaled_metrics_One.p90.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "CustomMetricOne" : 901, - "CustomMetricTwo" : 900607, - "allocatedResidentMemory" : 16515072, - "contextSwitches" : 0, - "cpuSystem" : 1750, - "cpuTotal" : 3041, - "cpuUser" : 1333, - "instructions" : 6667, - "mallocCountLarge" : 0, - "mallocCountSmall" : 0, - "mallocCountTotal" : 0, - "memoryLeaked" : 0, - "objectAllocCount" : 0, - "peakMemoryResident" : 15974400, - "peakMemoryResidentDelta" : 376832, - "peakMemoryVirtual" : 420477075456, - "readBytesPhysical" : 0, - "releaseCount" : 8, - "retainCount" : 8, - "retainReleaseDelta" : 0, - "syscalls" : 2, - "threads" : 3, - "threadsRunning" : 2, - "throughput" : 1043967, - "wallClock" : 1208, - "writeBytesPhysical" : 0, - "writeSyscalls" : 0 -} \ No newline at end of file diff --git a/Benchmarks/Benchmarks/Thresholds/Basic.SetupTeardown.p90.json b/Benchmarks/Benchmarks/Thresholds/Basic.SetupTeardown.p90.json deleted file mode 100644 index 056b4628..00000000 --- a/Benchmarks/Benchmarks/Thresholds/Basic.SetupTeardown.p90.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "cpuTotal" : 2833, - "instructions" : 962, - "mallocCountTotal" : 0, - "peakMemoryResident" : 12042240, - "throughput" : 1849343, - "wallClock" : 584 -} \ No newline at end of file diff --git a/Benchmarks/Benchmarks/Thresholds/Basic.SetupTeardown2.p90.json b/Benchmarks/Benchmarks/Thresholds/Basic.SetupTeardown2.p90.json deleted file mode 100644 index 464d85bd..00000000 --- a/Benchmarks/Benchmarks/Thresholds/Basic.SetupTeardown2.p90.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "cpuTotal" : 2833, - "instructions" : 962, - "mallocCountTotal" : 0, - "peakMemoryResident" : 12025856, - "throughput" : 1845247, - "wallClock" : 625 -} \ No newline at end of file diff --git a/Benchmarks/Benchmarks/Thresholds/Basic.SetupTeardown3.p90.json b/Benchmarks/Benchmarks/Thresholds/Basic.SetupTeardown3.p90.json deleted file mode 100644 index 7155173b..00000000 --- a/Benchmarks/Benchmarks/Thresholds/Basic.SetupTeardown3.p90.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "cpuTotal" : 2793, - "instructions" : 962, - "mallocCountTotal" : 0, - "peakMemoryResident" : 12058624, - "throughput" : 1845247, - "wallClock" : 584 -} \ No newline at end of file diff --git a/Benchmarks/Benchmarks/Thresholds/Basic.SetupTeardown4.p90.json b/Benchmarks/Benchmarks/Thresholds/Basic.SetupTeardown4.p90.json deleted file mode 100644 index 3dd92ffc..00000000 --- a/Benchmarks/Benchmarks/Thresholds/Basic.SetupTeardown4.p90.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "cpuTotal" : 2793, - "instructions" : 962, - "mallocCountTotal" : 0, - "peakMemoryResident" : 12042240, - "throughput" : 1845247, - "wallClock" : 584 -} \ No newline at end of file diff --git a/Benchmarks/Benchmarks/Thresholds/Basic.SetupTeardown5.p90.json b/Benchmarks/Benchmarks/Thresholds/Basic.SetupTeardown5.p90.json deleted file mode 100644 index 6eb1759b..00000000 --- a/Benchmarks/Benchmarks/Thresholds/Basic.SetupTeardown5.p90.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "cpuTotal" : 2709, - "instructions" : 956, - "mallocCountTotal" : 0, - "peakMemoryResident" : 12058624, - "throughput" : 1845247, - "wallClock" : 625 -} \ No newline at end of file diff --git a/Benchmarks/Benchmarks/Thresholds/Basic.SetupTeardown6.p90.json b/Benchmarks/Benchmarks/Thresholds/Basic.SetupTeardown6.p90.json deleted file mode 100644 index 82996982..00000000 --- a/Benchmarks/Benchmarks/Thresholds/Basic.SetupTeardown6.p90.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "cpuTotal" : 2833, - "instructions" : 1590, - "mallocCountTotal" : 0, - "peakMemoryResident" : 12075008, - "throughput" : 1716223, - "wallClock" : 666 -} \ No newline at end of file diff --git a/Benchmarks/Benchmarks/Thresholds/Basic.Statistics.p90.json b/Benchmarks/Benchmarks/Thresholds/Basic.Statistics.p90.json deleted file mode 100644 index 0df862d0..00000000 --- a/Benchmarks/Benchmarks/Thresholds/Basic.Statistics.p90.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "objectAllocCount" : 0, - "releaseCount" : 2000, - "retainCount" : 2000, - "retainReleaseDelta" : 0, - "wallClock" : 59615 -} \ No newline at end of file