Refactor tests into separate subproject

cli/build.gradle.kts

@@ -18,12 +18,14 @@ kotlin {
     }
     jvm {
         withJava()
+        jvmToolchain(8)
     }
 
     sourceSets {
         commonMain {
             dependencies {
                 implementation(project(":core"))
+                implementation(project(":testsuite"))
                 implementation("com.github.ajalt.clikt:clikt:4.2.1")
             }
         }

cli/src/commonMain/kotlin/komem/litmus/CliCommon.kt

@@ -7,7 +7,6 @@ import com.github.ajalt.clikt.parameters.arguments.multiple
 import com.github.ajalt.clikt.parameters.arguments.transformAll
 import com.github.ajalt.clikt.parameters.options.*
 import com.github.ajalt.clikt.parameters.types.int
-import komem.litmus.barriers.BarrierProducer
 import komem.litmus.generated.LitmusTestRegistry
 import kotlin.time.Duration
 
@@ -38,7 +37,7 @@ abstract class CliCommon : CliktCommand(
             }
             regexes.flatMap { LitmusTestRegistry[it] }.toSet()
         }
-        .check("no tests were selected") { it.isNotEmpty() }
+        .check("no tests were selected") { it.isNotEmpty() || listOnly }
 
     protected val PARALLELISM_DISABLED = Int.MAX_VALUE - 1
     protected val PARALLELISM_AUTO = Int.MAX_VALUE - 2
@@ -57,10 +56,15 @@ abstract class CliCommon : CliktCommand(
     protected abstract val barrierProducer: BarrierProducer
     // TODO: we don't talk about memshuffler for now
 
+    protected val listOnly by option("-l", "--listOnly").flag()
     // TODO: dry run = simply list tests
 
     override fun run() {
-        echo("selected tests: \n" + tests.joinToString("\n") { " - " + LitmusTestRegistry.resolveName(it) })
+        if (listOnly) {
+            runListOnly()
+            return
+        }
+        echo("selected tests: \n" + tests.joinToString("\n") { " - " + it.name })
         echo("in total: ${tests.size} tests")
         echo()
 
@@ -118,6 +122,12 @@ abstract class CliCommon : CliktCommand(
             }
         }
     }
+
+    private fun runListOnly() {
+        echo("all known tests:\n" + LitmusTestRegistry.all().joinToString("\n") { " * " + it.name })
+        echo()
+        echo("selected tests:\n" + tests.joinToString("\n") { " - " + it.name })
+    }
 }
 
 fun commonMain(args: Array<String>, cli: CliCommon) {

cli/src/jvmMain/kotlin/komem/litmus/CliJvm.kt

@@ -4,7 +4,6 @@ import com.github.ajalt.clikt.parameters.options.*
 import com.github.ajalt.clikt.parameters.types.choice
 import jcstressDirectory
 import komem.litmus.barriers.JvmSpinBarrier
-import komem.litmus.jcstress.JCStressRunner
 
 class CliJvm : CliCommon() {
     override val runner by option("-r", "--runner")

codegen/src/main/kotlin/komem/litmus/LitmusTestProcessor.kt

@@ -14,8 +14,9 @@ class LitmusTestProcessor(val codeGenerator: CodeGenerator) : SymbolProcessor {
     override fun process(resolver: Resolver): List<KSAnnotated> {
         val basePackage = "komem.litmus"
         val registryFileName = "LitmusTestRegistry"
+        val testsPackage = "$basePackage.tests"
 
-        val testFiles = resolver.getAllFiles().filter { it.packageName.asString() == "$basePackage.testsuite" }.toList()
+        val testFiles = resolver.getAllFiles().filter { it.packageName.asString() == testsPackage }.toList()
         val dependencies = Dependencies(true, *testFiles.toTypedArray())
 
         val registryFile = try {
@@ -26,7 +27,7 @@ class LitmusTestProcessor(val codeGenerator: CodeGenerator) : SymbolProcessor {
 
         val decls = testFiles.flatMap { it.declarations }.filterIsInstance<KSPropertyDeclaration>()
         val namedTestsMap = decls.associate {
-            val relativePackage = it.packageName.asString().removePrefix("$basePackage.testsuite")
+            val relativePackage = it.packageName.asString().removePrefix(testsPackage)
             val testAlias = (if (relativePackage.isEmpty()) "" else "$relativePackage.") +
                     it.containingFile!!.fileName.removeSuffix(".kt") +
                     "." + it.simpleName.getShortName()

core/build.gradle.kts

@@ -2,7 +2,6 @@ import org.jetbrains.kotlin.incremental.createDirectory
 
 plugins {
     kotlin("multiplatform")
-    id("com.google.devtools.ksp") version "1.9.20-1.0.13"
     `java-library`
 }
 
@@ -45,19 +44,13 @@ kotlin {
                     kotlinOptions.freeCompilerArgs = listOf("-Xtemporary-files-dir=${tempDir.absolutePath}")
                 }
             }
-            binaries {
-                executable {
-                    entryPoint = "main"
-                }
-            }
         }
     }
     sourceSets {
         commonMain {
             dependencies {
                 implementation("org.jetbrains.kotlinx:atomicfu:0.20.2")
             }
-            kotlin.srcDir(layout.buildDirectory.dir("generated/ksp/metadata/commonMain/kotlin/")) // ksp
         }
         commonTest {
             dependencies {
@@ -105,19 +98,6 @@ tasks.register("bitcodeRelease") {
     finalizedBy(bitcodeInternal)
 }
 
-// ======== ksp ========
-
-dependencies {
-    add("kspCommonMainMetadata", project(":codegen"))
-}
-
-tasks.whenTaskAdded {
-    if (name == "kspCommonMainKotlinMetadata") {
-        val kspTask = this
-        tasks.matching { it.name.startsWith("compileKotlin") }.forEach { it.dependsOn(kspTask) }
-    }
-}
-
 val jcsDir: File get() = File(System.getenv("JCS_DIR") ?: error("JCS_DIR envvar is not set"))
 
 tasks.register<Copy>("copyLibToJCStress") {

core/src/commonMain/kotlin/komem/litmus/barriers/Barrier.kt → core/src/commonMain/kotlin/komem/litmus/Barrier.kt

@@ -1,4 +1,4 @@
-package komem.litmus.barriers
+package komem.litmus
 
 interface Barrier {
     fun await()

core/src/commonMain/kotlin/komem/litmus/LitmusRunParams.kt

@@ -1,7 +1,5 @@
 package komem.litmus
 
-import komem.litmus.barriers.BarrierProducer
-
 data class LitmusRunParams(
     val batchSize: Int,
     val syncPeriod: Int,

core/src/commonMain/kotlin/komem/litmus/LitmusTest.kt

@@ -1,7 +1,5 @@
 package komem.litmus
 
-import komem.litmus.generated.LitmusTestRegistry
-
 data class LitmusTest<S>(
     val stateProducer: () -> S,
     val threadFunctions: List<S.() -> Unit>,
@@ -49,6 +47,3 @@ class LitmusTestScope<S>(
 
 fun <S> litmusTest(stateProducer: () -> S, setup: LitmusTestScope<S>.() -> Unit) =
     LitmusTestScope(stateProducer).apply(setup).build()
-
-val LitmusTest<*>.name get() = LitmusTestRegistry.resolveName(this)
-val LitmusTest<*>.javaClassName get() = name.replace('.', '_')

core/src/jvmMain/kotlin/komem/litmus/barriers/JvmCyclicBarrier.kt

@@ -1,5 +1,6 @@
 package komem.litmus.barriers
 
+import komem.litmus.Barrier
 import java.util.concurrent.CyclicBarrier
 
 class JvmCyclicBarrier(threadCount: Int) : Barrier {

core/src/jvmMain/kotlin/komem/litmus/barriers/JvmSpinBarrier.kt

@@ -1,5 +1,6 @@
 package komem.litmus.barriers
 
+import komem.litmus.Barrier
 import java.util.concurrent.atomic.AtomicInteger
 
 class JvmSpinBarrier(private val threadCount: Int) : Barrier {

core/src/nativeMain/kotlin/komem.litmus/WorkerRunner.kt

@@ -1,6 +1,5 @@
 package komem.litmus
 
-import komem.litmus.barriers.Barrier
 import kotlin.experimental.ExperimentalNativeApi
 import kotlin.native.concurrent.ObsoleteWorkersApi
 import kotlin.native.concurrent.TransferMode

core/src/nativeMain/kotlin/komem.litmus/barriers/CinteropSpinBarrier.kt

@@ -3,6 +3,7 @@ package komem.litmus.barriers
 import barrier.CSpinBarrier
 import barrier.barrier_wait
 import barrier.create_barrier
+import komem.litmus.Barrier
 import kotlinx.cinterop.CPointer
 import kotlinx.cinterop.ExperimentalForeignApi
 

core/src/nativeMain/kotlin/komem.litmus/barriers/KNativeSpinBarrier.kt

@@ -1,5 +1,6 @@
 package komem.litmus.barriers
 
+import komem.litmus.Barrier
 import kotlin.concurrent.AtomicInt
 
 class KNativeSpinBarrier(private val threadCount: Int) : Barrier {

jcstress-wrapper/build.gradle.kts

@@ -7,7 +7,12 @@ application {
     mainClass = "MainKt"
 }
 
+kotlin {
+    jvmToolchain(8)
+}
+
 dependencies {
     implementation(project(":core"))
+    implementation(project(":testsuite"))
     implementation(kotlin("reflect"))
 }

core/src/jvmMain/kotlin/komem/litmus/jcstress/JCStressRunner.kt → jcstress-wrapper/src/main/kotlin/komem/litmus/JCStressRunner.kt

@@ -1,6 +1,5 @@
-package komem.litmus.jcstress
+package komem.litmus
 
-import komem.litmus.*
 import java.nio.file.Path
 import kotlin.system.exitProcess
 

settings.gradle.kts

@@ -4,3 +4,4 @@ include(":core")
 include(":codegen")
 include(":jcstress-wrapper")
 include(":cli")
+include(":testsuite")