Add a separate aggressive GC mode

kotlin-native/backend.native/cli.bc/src/org/jetbrains/kotlin/cli/bc/K2Native.kt

@@ -293,6 +293,10 @@ class K2Native : CLICompiler<K2NativeCompilerArguments>() {
                         GC.SAME_THREAD_MARK_AND_SWEEP
                     }
                 })
+                if (memoryModel != MemoryModel.EXPERIMENTAL && arguments.gcAggressive) {
+                    configuration.report(ERROR, "-Xgc-aggressive is only supported for -memory-model experimental")
+                }
+                put(GARBAGE_COLLECTOR_AGRESSIVE, arguments.gcAggressive)
             }
         }
     }

kotlin-native/backend.native/cli.bc/src/org/jetbrains/kotlin/cli/bc/K2NativeCompilerArguments.kt

@@ -308,6 +308,9 @@ class K2NativeCompilerArguments : CommonCompilerArguments() {
     @Argument(value="-Xgc", valueDescription = "<gc>", description = "GC to use, 'noop' and 'stms' are currently supported. Works only with -memory-model experimental")
     var gc: String? = null
 
+    @Argument(value="-Xgc-aggressive", description = "Make GC agressive. Works only with -memory-model experimental")
+    var gcAggressive: Boolean = false
+
     override fun configureAnalysisFlags(collector: MessageCollector): MutableMap<AnalysisFlag<*>, Any> =
             super.configureAnalysisFlags(collector).also {
                 val useExperimental = it[AnalysisFlags.useExperimental] as List<*>

kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanConfig.kt

@@ -48,6 +48,7 @@ class KonanConfig(val project: Project, val configuration: CompilerConfiguration
     val memoryModel: MemoryModel get() = configuration.get(KonanConfigKeys.MEMORY_MODEL)!!
     val destroyRuntimeMode: DestroyRuntimeMode get() = configuration.get(KonanConfigKeys.DESTROY_RUNTIME_MODE)!!
     val gc: GC get() = configuration.get(KonanConfigKeys.GARBAGE_COLLECTOR)!!
+    val gcAggressive: Boolean get() = configuration.get(KonanConfigKeys.GARBAGE_COLLECTOR_AGRESSIVE)!!
 
     val needVerifyIr: Boolean
         get() = configuration.get(KonanConfigKeys.VERIFY_IR) == true

kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanConfigurationKeys.kt

@@ -155,6 +155,7 @@ class KonanConfigKeys {
         val DESTROY_RUNTIME_MODE: CompilerConfigurationKey<DestroyRuntimeMode>
                 = CompilerConfigurationKey.create("when to destroy runtime")
         val GARBAGE_COLLECTOR: CompilerConfigurationKey<GC> = CompilerConfigurationKey.create("gc")
+        val GARBAGE_COLLECTOR_AGRESSIVE: CompilerConfigurationKey<Boolean> = CompilerConfigurationKey.create("turn on agressive GC mode")
     }
 }
 

kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/IrToBitcode.kt

@@ -2458,6 +2458,7 @@ internal class CodeGeneratorVisitor(val context: Context, val lifetimes: Map<IrE
             return
 
         overrideRuntimeGlobal("Kotlin_destroyRuntimeMode", Int32(context.config.destroyRuntimeMode.value))
+        overrideRuntimeGlobal("Kotlin_gcAggressive", Int32(if (context.config.gcAggressive) 1 else 0))
     }
 
     //-------------------------------------------------------------------------//

kotlin-native/backend.native/tests/build.gradle

@@ -109,6 +109,13 @@ tasks.withType(RunExternalTestGroup.class).configureEach {
 
 ext.isExperimentalMM = project.globalTestArgs.contains("-memory-model") && project.globalTestArgs.contains("experimental")
 
+if (ext.isExperimentalMM) {
+    // TODO: Make it more aggressive and only turn it on for a subset of tests.
+    tasks.withType(KonanCompileNativeBinary.class).configureEach {
+        extraOpts "-Xgc-aggressive"
+    }
+}
+
 allprojects {
     // Root directories for test output (logs, compiled files, statistics etc). Only single path must be in each set.
     // backend.native/tests
@@ -5029,6 +5036,7 @@ if (UtilsKt.getTestTargetSupportsCodeCoverage(project)) {
                 baseDir "$testOutputCoverage/$binaryName"
                 entryPoint "coverage.basic.program.main"
                 extraOpts "-Xcoverage", "-Xcoverage-file=$profrawFile"
+                extraOpts project.globalTestArgs
             }
         }
     }
@@ -5051,6 +5059,7 @@ if (UtilsKt.getTestTargetSupportsCodeCoverage(project)) {
                 baseDir "$testOutputCoverage/$binaryName"
                 entryPoint "coverage.basic.library.main"
                 extraOpts "-Xcoverage-file=$profrawFile", "-Xlibrary-to-cover=${konanArtifacts.lib_to_cover.getArtifactByTarget(target.name)}"
+                extraOpts project.globalTestArgs
             }
         }
     }
@@ -5066,6 +5075,7 @@ if (UtilsKt.getTestTargetSupportsCodeCoverage(project)) {
                 baseDir "$testOutputCoverage/$binaryName"
                 entryPoint "coverage.basic.controlflow.main"
                 extraOpts "-Xcoverage", "-Xcoverage-file=$profrawFile"
+                extraOpts project.globalTestArgs
             }
         }
     }
@@ -5081,6 +5091,7 @@ if (UtilsKt.getTestTargetSupportsCodeCoverage(project)) {
                 baseDir "$testOutputCoverage/$binaryName"
                 entryPoint "coverage.basic.jumps.main"
                 extraOpts "-Xcoverage", "-Xcoverage-file=$profrawFile"
+                extraOpts project.globalTestArgs
             }
         }
     }
@@ -5096,6 +5107,7 @@ if (UtilsKt.getTestTargetSupportsCodeCoverage(project)) {
                 baseDir "$testOutputCoverage/$binaryName"
                 entryPoint "coverage.basic.smoke0.main"
                 extraOpts "-Xcoverage", "-Xcoverage-file=$profrawFile"
+                extraOpts project.globalTestArgs
             }
         }
     }
@@ -5111,6 +5123,7 @@ if (UtilsKt.getTestTargetSupportsCodeCoverage(project)) {
                 baseDir "$testOutputCoverage/$binaryName"
                 entryPoint "coverage.basic.smoke1.main"
                 extraOpts "-Xcoverage", "-Xcoverage-file=$profrawFile"
+                extraOpts project.globalTestArgs
             }
         }
     }

kotlin-native/runtime/src/gc/stms/cpp/SameThreadMarkAndSweep.cpp

@@ -109,6 +109,14 @@ void gc::SameThreadMarkAndSweep::ThreadData::SafePointRegular(size_t weight) noe
     safePointsCounter_ += weight;
 }
 
+gc::SameThreadMarkAndSweep::SameThreadMarkAndSweep() noexcept {
+    if (Kotlin_getGcAggressive()) {
+        // TODO: Make it even more aggressive and run on a subset of backend.native tests.
+        threshold_ = 1000;
+        allocationThresholdBytes_ = 10000;
+    }
+}
+
 mm::ObjectFactory<gc::SameThreadMarkAndSweep>::FinalizerQueue gc::SameThreadMarkAndSweep::PerformFullGC() noexcept {
     bool didSuspend = mm::SuspendThreads();
     if (!didSuspend) {

kotlin-native/runtime/src/gc/stms/cpp/SameThreadMarkAndSweep.hpp

@@ -63,7 +63,7 @@ public:
         size_t safePointsCounter_ = 0;
     };
 
-    SameThreadMarkAndSweep() noexcept {}
+    SameThreadMarkAndSweep() noexcept;
     ~SameThreadMarkAndSweep() = default;
 
     void SetThreshold(size_t value) noexcept { threshold_ = value; }
@@ -78,8 +78,8 @@ public:
 private:
     mm::ObjectFactory<SameThreadMarkAndSweep>::FinalizerQueue PerformFullGC() noexcept;
 
-    size_t threshold_ = 1000;
-    size_t allocationThresholdBytes_ = 10000;
+    size_t threshold_ = 100000;  // Roughly 1 safepoint per 10ms (on a subset of examples on one particular machine).
+    size_t allocationThresholdBytes_ = 10 * 1024 * 1024;  // 10MiB by default.
     bool autoTune_ = false;
 };
 

kotlin-native/runtime/src/main/cpp/Runtime.cpp

@@ -31,13 +31,18 @@ struct InitNode {
   InitNode* next;
 };
 
-// This global is overriden by the compiler.
+// These globals are overriden by the compiler.
 RUNTIME_WEAK DestroyRuntimeMode Kotlin_destroyRuntimeMode = DESTROY_RUNTIME_ON_SHUTDOWN;
+RUNTIME_WEAK KInt Kotlin_gcAggressive = 0;
 
 DestroyRuntimeMode Kotlin_getDestroyRuntimeMode() {
     return Kotlin_destroyRuntimeMode;
 }
 
+bool Kotlin_getGcAggressive() {
+    return Kotlin_gcAggressive != 0;
+}
+
 namespace {
 
 InitNode* initHeadNode = nullptr;

kotlin-native/runtime/src/main/cpp/Runtime.h

@@ -32,6 +32,7 @@ enum DestroyRuntimeMode {
 };
 
 DestroyRuntimeMode Kotlin_getDestroyRuntimeMode();
+bool Kotlin_getGcAggressive();
 
 // For experimental MM, if runtime gets initialized, it will be in the native state after this.
 RUNTIME_NOTHROW void Kotlin_initRuntimeIfNeeded();