azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[K/N] Extract Module in CompileToBitcodePlugin ^KT-53776

Browse Source 
Merge-request: KT-MR-7960
Merged-by: Alexander Shabalin <Alexander.Shabalin@jetbrains.com>
This commit is contained in:
Alexander Shabalin
2022-12-21 22:30:25 +00:00
committed by Space Team
parent 7cbe13dee9
commit ff2f163ac9
11 changed files with 761 additions and 274 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kotlin-native/runtime/build.gradle.kts
+159 -50
View File
@@ -4,6 +4,7 @@
*/
import org.jetbrains.kotlin.*
import org.jetbrains.kotlin.bitcode.CompileToBitcodeExtension
import org.jetbrains.kotlin.cpp.CppUsage
import org.jetbrains.kotlin.gradle.plugin.konan.tasks.KonanCacheTask
import org.jetbrains.kotlin.konan.properties.loadProperties
import org.jetbrains.kotlin.konan.properties.saveProperties
@@ -38,14 +39,28 @@ val targetList: List<String> by project
bitcode {
allTargets {
module("main") {
// TODO: Split out out `base` module and merge it together with `main` into `runtime.bc`
if (sanitizer == null) {
outputFile.set(layout.buildDirectory.file("bitcode/main/$target/runtime.bc"))
sourceSets {
main {
// TODO: Split out out `base` module and merge it together with `main` into `runtime.bc`
if (sanitizer == null) {
outputFile.set(layout.buildDirectory.file("bitcode/main/$target/runtime.bc"))
}
}
testFixtures {}
test {}
}
}
module("mimalloc") {
val srcRoot = file("src/mimalloc")
sourceSets {
main {
inputFiles.from(srcRoot.dir("c"))
inputFiles.include("**/*.c")
inputFiles.exclude("**/alloc-override*.c", "**/page-queue.c", "**/static.c", "**/bitmap.inc.c")
headersDirs.setFrom(srcRoot.dir("c/include"))
}
}
compiler.set("clang")
compilerArgs.set(listOfNotNull(
"-std=gnu11",
@@ -58,16 +73,11 @@ bitcode {
"-Wno-unused-parameter", /* for windows 32 */
"-DMI_TSAN=1".takeIf { sanitizer == SanitizerKind.THREAD },
))
inputFiles.from("$srcRoot/c")
inputFiles.include("**/*.c")
inputFiles.exclude("**/alloc-override*.c", "**/page-queue.c", "**/static.c", "**/bitmap.inc.c")
headersDirs.setFrom("$srcRoot/c/include")
onlyIf { targetSupportsMimallocAllocator(target.name) }
onlyIf { target.supportsMimallocAllocator() }
}
module("libbacktrace") {
val srcRoot = file("src/libbacktrace")
val elfSize = when (target.architecture) {
TargetArchitecture.X64, TargetArchitecture.ARM64 -> 64
TargetArchitecture.X86, TargetArchitecture.ARM32,
@@ -76,6 +86,29 @@ bitcode {
}
val useMachO = target.family.isAppleFamily
val useElf = target.family in listOf(Family.LINUX, Family.ANDROID)
sourceSets {
main {
inputFiles.from(srcRoot.dir("c"))
inputFiles.include(listOfNotNull(
"atomic.c",
"backtrace.c",
"dwarf.c",
"elf.c".takeIf { useElf },
"fileline.c",
"macho.c".takeIf { useMachO },
"mmap.c",
"mmapio.c",
"posix.c",
"print.c",
"simple.c",
"sort.c",
"state.c"
))
headersDirs.setFrom(srcRoot.dir("c/include"))
}
}
compiler.set("clang")
compilerArgs.set(listOfNotNull(
"-std=gnu11",
@@ -92,117 +125,193 @@ bitcode {
"-DBACKTRACE_ELF_SIZE=$elfSize".takeIf { useElf },
"-Wno-atomic-alignment"
))
inputFiles.from("$srcRoot/c")
inputFiles.include(listOfNotNull(
"atomic.c",
"backtrace.c",
"dwarf.c",
"elf.c".takeIf { useElf },
"fileline.c",
"macho.c".takeIf { useMachO },
"mmap.c",
"mmapio.c",
"posix.c",
"print.c",
"simple.c",
"sort.c",
"state.c"
))
headersDirs.setFrom("$srcRoot/c/include")
onlyIf { targetSupportsLibBacktrace(target.name) }
onlyIf { target.supportsLibBacktrace() }
}
module("compiler_interface") {
headersDirs.from(files("src/main/cpp"))
sourceSets {
main {}
}
}
module("launcher") {
headersDirs.from(files("src/main/cpp"))
sourceSets {
main {}
}
}
module("debug") {
headersDirs.from(files("src/main/cpp"))
sourceSets {
main {}
}
}
module("std_alloc") {
headersDirs.from(files("src/main/cpp"))
sourceSets {
main {}
}
}
module("custom_alloc") {
headersDirs.from(files("src/main/cpp", "src/mm/cpp", "src/gc/common/cpp", "src/gc/cms/cpp"))
sourceSets {
main {}
test {}
}
compilerArgs.add("-DCUSTOM_ALLOCATOR")
// Directly depends on cms which is only supported with threads.
onlyIf { targetSupportsThreads(target.name) }
onlyIf { target.supportsThreads() }
}
module("opt_alloc") {
headersDirs.from(files("src/main/cpp"))
sourceSets {
main {}
}
}
module("exceptionsSupport", file("src/exceptions_support")) {
module("exceptionsSupport") {
srcRoot.set(layout.projectDirectory.dir("src/exceptions_support"))
headersDirs.from(files("src/main/cpp"))
sourceSets {
main {}
}
}
module("source_info_core_symbolication", file("src/source_info/core_symbolication")) {
module("source_info_core_symbolication") {
srcRoot.set(layout.projectDirectory.dir("src/source_info/core_symbolication"))
headersDirs.from(files("src/main/cpp"))
onlyIf { targetSupportsCoreSymbolication(target.name) }
sourceSets {
main {}
}
onlyIf { target.supportsCoreSymbolication() }
}
module("source_info_libbacktrace", file("src/source_info/libbacktrace")) {
module("source_info_libbacktrace") {
srcRoot.set(layout.projectDirectory.dir("src/source_info/libbacktrace"))
headersDirs.from(files("src/main/cpp", "src/libbacktrace/c/include"))
onlyIf { targetSupportsLibBacktrace(target.name) }
sourceSets {
main {}
}
onlyIf { target.supportsLibBacktrace() }
}
module("strict") {
headersDirs.from(files("src/main/cpp"))
sourceSets {
main {}
}
}
module("relaxed") {
headersDirs.from(files("src/main/cpp"))
sourceSets {
main {}
}
}
module("profileRuntime", file("src/profile_runtime"))
module("profileRuntime") {
srcRoot.set(layout.projectDirectory.dir("src/profile_runtime"))
sourceSets {
main {}
}
}
module("objc") {
headersDirs.from(files("src/main/cpp"))
sourceSets {
main {}
}
}
module("test_support", outputGroup = "test") {
headersDirs.from(files("src/main/cpp"), googletest.headersDirs)
dependsOn("downloadGoogleTest")
}
module("legacy_memory_manager", file("src/legacymm")) {
module("test_support") {
headersDirs.from(files("src/main/cpp"))
sourceSets {
testFixtures {
inputFiles.include("**/*.cpp", "**/*.mm")
}
}
}
module("experimental_memory_manager", file("src/mm")) {
module("legacy_memory_manager") {
srcRoot.set(layout.projectDirectory.dir("src/legacymm"))
headersDirs.from(files("src/main/cpp"))
sourceSets {
main {}
testFixtures {}
}
}
module("experimental_memory_manager") {
srcRoot.set(layout.projectDirectory.dir("src/mm"))
headersDirs.from(files("src/gc/common/cpp", "src/main/cpp"))
sourceSets {
main {}
testFixtures {}
test {}
}
}
module("common_gc", file("src/gc/common")) {
module("common_gc") {
srcRoot.set(layout.projectDirectory.dir("src/gc/common"))
headersDirs.from(files("src/mm/cpp", "src/main/cpp"))
sourceSets {
main {}
test {}
}
}
module("noop_gc", file("src/gc/noop")) {
module("noop_gc") {
srcRoot.set(layout.projectDirectory.dir("src/gc/noop"))
headersDirs.from(files("src/gc/noop/cpp", "src/gc/common/cpp", "src/mm/cpp", "src/main/cpp"))
sourceSets {
main {}
testFixtures {}
}
}
module("same_thread_ms_gc", file("src/gc/stms")) {
module("same_thread_ms_gc") {
srcRoot.set(layout.projectDirectory.dir("src/gc/stms"))
headersDirs.from(files("src/gc/stms/cpp", "src/gc/common/cpp", "src/mm/cpp", "src/main/cpp"))
sourceSets {
main {}
testFixtures {}
test {}
}
}
module("concurrent_ms_gc", file("src/gc/cms")) {
module("concurrent_ms_gc") {
srcRoot.set(layout.projectDirectory.dir("src/gc/cms"))
headersDirs.from(files("src/gc/cms/cpp", "src/gc/common/cpp", "src/mm/cpp", "src/main/cpp"))
sourceSets {
main {}
testFixtures {}
test {}
}
onlyIf { targetSupportsThreads(target.name) }
onlyIf { target.supportsThreads() }
}
module("concurrent_ms_gc_custom", file("src/gc/cms")) {
module("concurrent_ms_gc_custom") {
srcRoot.set(layout.projectDirectory.dir("src/gc/cms"))
headersDirs.from(files("src/gc/cms/cpp", "src/gc/common/cpp", "src/mm/cpp", "src/main/cpp", "src/custom_alloc/cpp"))
sourceSets {
main {}
testFixtures {}
test {}
}
compilerArgs.add("-DCUSTOM_ALLOCATOR")
onlyIf { targetSupportsThreads(target.name) }
onlyIf { target.supportsThreads() }
}
testsGroup("std_alloc_runtime_tests") {
@@ -248,7 +357,7 @@ val runtimeBitcode by configurations.creating {
isCanBeConsumed = false
isCanBeResolved = true
attributes {
attribute(Usage.USAGE_ATTRIBUTE, objects.named(CompileToBitcodeExtension.USAGE))
attribute(CppUsage.USAGE_ATTRIBUTE, objects.named(CppUsage.LLVM_BITCODE))
}
}