add setting for tests

Author: ProALgebra

all_test.py

@@ -14,8 +14,9 @@ def get_cmd(mem):
             task,
             f"-DtestMaxHeapSize={mem}m",
             "--tests", test_name,
-            f"-Dspecial_case = {test_case_name}",
-            f"-Dcount_for_case=1"
+            f"-Dspecial_case={test_case_name}",
+            f"-Dcount_for_case=1",
+            f"-Dwrite_case_time=0"
         ]
 
     cache = {}
@@ -25,8 +26,11 @@ def execute(mem):
             return cache[mem]
 
         cmd = get_cmd(mem)
-        process = subprocess.run(cmd, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
-        return_code = process.returncode
+        try:
+            process = subprocess.run(cmd, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL,timeout=60)
+            return_code = process.returncode
+        except:
+            return_code = 1
         cache[mem] = return_code
         return return_code
 
@@ -35,6 +39,7 @@ def execute(mem):
     max_mem = 4*1024
     while r <= max_mem:
         return_code = execute(r)
+        print(r)
         if return_code != 0:
             l = r
             r *= 2
@@ -45,6 +50,7 @@ def execute(mem):
 
     while l < r - 1:
         m = (l + r) // 2
+        print(m)
         return_code = execute(m)
 
         if return_code != 0:
@@ -57,14 +63,23 @@ def execute(mem):
 
 with open("tests_list.conf", "r") as input:
     with open(f"res.txt", "w") as output:
-        output.write(f"test,mem\n")
+        output.write(f"test,case,mem\n")
         for line in input:
             config = line.split()
             test_name = config[0]
             test_case_name = config[1]
             print(test_name)
             print(test_case_name)
             mem = run_test_for_mem(test_name)
+            cmd = [
+                  gradlew,
+                  task,
+                  f"-DtestMaxHeapSize=15m",
+                  "--tests", test_name,
+                  f"-Dspecial_case={test_case_name}",
+                  f"-Dcount_for_case=1"
+              ]
+            process = subprocess.run(cmd, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+            return_code = process.returncode
             print(f"Got for test = {test_name}: {mem}mb")
-
-            output.write(f"{test_name},{mem}\n")
+            output.write(f"{test_name},{test_case_name},{mem}\n")

test-shared/build.gradle.kts

@@ -23,13 +23,15 @@ tasks.test {
     val heapSize = (System.getProperty("testMaxHeapSize") ?: "100m") // ограничение памяти для JVM тестов
     val special_case = System.getProperty("special_case") ?: "nothing"
     val count_for_case = System.getProperty("count_for_case") ?: "50"
+    val write_case_time = System.getProperty("write_case_time") ?: "1"
     maxHeapSize = heapSize
 
     jvmArgs(
       //  "-XX:+PrintGCDetails",
     //    "-Xlog:gc*:file=gc.log:time,uptime,level,tags",
         "-Dspecial_case=$special_case",
-        "-Dcount_for_case=$count_for_case"
+        "-Dcount_for_case=$count_for_case",
+        "-Dwrite_case_time=$write_case_time"
     )
 }
 kotlin {

test-shared/src/test/kotlin/solver/benchmarks/AbstractBenchmarkTest.kt

@@ -84,7 +84,7 @@ abstract class AbstractBenchmarkTest {
         for (folder in testCasesFolder.listFiles()) {
             if((!special_case.isNullOrEmpty() && special_case != "nothing") && folder.name != special_case) {
 
-                println(special_case.isNullOrEmpty())
+
                 continue;
             }
             if (folder.isDirectory) {
@@ -105,9 +105,12 @@ abstract class AbstractBenchmarkTest {
         val time = LocalDateTime.now()
         val formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")
         val formattedDateTime = time.format(formatter)
-        val logsFile = File(result_folder.toPath().toString(), formattedDateTime+"work_times" +".logs")
-        val resultsLog = File(result_folder.toPath().toString(), formattedDateTime+"results" +".logs")
-        val actualResult = createTree(input, grammar)
+        var logsFile: File? = null
+        var resultsLog: File? = null
+        if(System.getProperty("write_case_time") == "1") {
+            logsFile = File(result_folder.toPath().toString(), formattedDateTime + "work_times" + ".logs")
+            resultsLog = File(result_folder.toPath().toString(), formattedDateTime + "results" + ".logs")
+        }
         var x = 0
         var logs = ""
         val timeMeasurements = mutableListOf<Long>()
@@ -117,7 +120,6 @@ abstract class AbstractBenchmarkTest {
         val used = (Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory()) / (1024 * 1024)
         println("Used memory: " + used + " MB")
         val max_test_count = System.getProperty("count_for_case").toInt()
-        println("Used memorsssssy: " + max_test_count + " MB")
         MemoryMonitor.start()
         while (x < max_test_count) {
             val start = System.nanoTime()
@@ -143,12 +145,18 @@ abstract class AbstractBenchmarkTest {
         println("===========================")
         // останавливаем и получаем пик
         println("Peak memory usage: $peak MB")
-        logsFile.writeText(logs)
+        if(System.getProperty("write_case_time") == "1") {
+            logsFile?.writeText(logs)
+        }
         logs = "\n=== PERFORMANCE RESULTS === \n Total iterations: ${timeMeasurements.size} \n Average time: ${"%.3f".format(averageTime / 1_000_000)} ms" +
                 "\n Min time: ${minTime / 1_000_000} ms" +
                 "\nMax time: ${maxTime / 1_000_000} ms" +
-                "Total time: ${totalTime / 1_000_000_000.0} seconds"
-        resultsLog.writeText(logs)
+                "\nTotal time: ${totalTime / 1_000_000_000.0} seconds"+
+                "\nPeak memory usage: $peak MB"
+
+        if(System.getProperty("write_case_time") == "1") {
+            resultsLog?.writeText(logs)
+        }
 
     }