optimization: use puts for simple strings & inline getelementptr calls

SrGaabriel · Sep 9, 2024 · 0d412e2 · 0d412e2
1 parent 692f432
commit 0d412e2
Show file tree

Hide file tree

Showing 11 changed files with 35 additions and 22 deletions.
diff --git a/backend/llvm/src/commonMain/kotlin/intrinsic/Print.kt b/backend/llvm/src/commonMain/kotlin/intrinsic/Print.kt
@@ -22,7 +22,7 @@ class PrintlnIntrinsicFunctionExecutor : IntrinsicFunctionExecutor<DragonHookCon
         if (formatName == null || formatCode == null) {
             context.functionDsl.run {
                 callExternal(
-                    functionName = "printf",
+                    functionName = "puts",
                     returnType = DragonType.Int32,
                     arguments = listOf(context.argumentValues.single()),
                     definition = listOf(DragonType.Pointer(DragonType.Int8)),
@@ -33,7 +33,7 @@ class PrintlnIntrinsicFunctionExecutor : IntrinsicFunctionExecutor<DragonHookCon
         }
 
         context.functionDsl.run {
-            val format = useFormat(formatName, formatCode).assign(constantOverride = true)
+            val format = useFormat(formatName, formatCode)
             callExternal(
                 functionName = "printf",
                 returnType = DragonType.Int32,

diff --git a/bard/output/ll/bard.ll b/bard/output/ll/bard.ll
@@ -2,17 +2,17 @@
 \00"
 declare i32 @printf(i8*, ...)
 @str_1613095350 = unnamed_addr constant [14 x i8] c"Hello, World!\00"
+declare i32 @puts(i8*)
 
 define i32 @test() {
   ret i32 8
 }
 define i32 @main() {
   %1 = call i32 @test()
-  %2 = getelementptr [4 x i8], [4 x i8]* @formatln_int32, i32 0, i32 0
-  call i32 @printf(i8* %2, i32 %1)
-  call i32 @printf(i8* %2, i32 %1)
-  call i32 @printf(i8* %2, i32 %1)
-  %6 = getelementptr [14 x i8], [14 x i8]* @str_1613095350, i32 0, i32 0
-  call i32 @printf(i8* %6)
+  call i32 @printf(i8* getelementptr ([4 x i8], [4 x i8]* @formatln_int32, i32 0, i32 0), i32 %1)
+  call i32 @printf(i8* getelementptr ([4 x i8], [4 x i8]* @formatln_int32, i32 0, i32 0), i32 %1)
+  call i32 @printf(i8* getelementptr ([4 x i8], [4 x i8]* @formatln_int32, i32 0, i32 0), i32 %1)
+  %5 = getelementptr [14 x i8], [14 x i8]* @str_1613095350, i32 0, i32 0
+  call i32 @puts(i8* %5)
   ret i32 %1
 }
diff --git a/bard/output/output.exe b/bard/output/output.exe
diff --git a/ryujin/src/commonMain/kotlin/statement/ControlFlow.kt b/ryujin/src/commonMain/kotlin/statement/ControlFlow.kt
@@ -8,7 +8,7 @@ class ReturnStatement(
 ) : DragonStatement {
     override val memoryDependencies: Set<Value> = setOf(value)
 
-    override fun llvm(): String {
+    override fun statementLlvm(): String {
         if (value.type == DragonType.Void) {
             return "ret void"
         }

diff --git a/ryujin/src/commonMain/kotlin/statement/DragonStatement.kt b/ryujin/src/commonMain/kotlin/statement/DragonStatement.kt
@@ -8,7 +8,7 @@ sealed interface DragonStatement {
 
     fun isValid(): Boolean = true
 
-    fun llvm(): String
+    fun statementLlvm(): String
 }
 
 interface TypedDragonStatement : DragonStatement {

diff --git a/ryujin/src/commonMain/kotlin/statement/Functions.kt b/ryujin/src/commonMain/kotlin/statement/Functions.kt
@@ -11,7 +11,7 @@ data class CallStatement(
 ) : TypedDragonStatement {
     override val memoryDependencies: Set<Value> = arguments.toSet()
 
-    override fun llvm(): String {
+    override fun statementLlvm(): String {
         return "call ${type.llvm} @${functionName}(${arguments.joinToString { "${it.type.llvm} ${it.llvm()}" }})"
     }
 }
diff --git a/ryujin/src/commonMain/kotlin/statement/Math.kt b/ryujin/src/commonMain/kotlin/statement/Math.kt
@@ -16,6 +16,6 @@ class AddStatement(
 
     override val type: DragonType get() = left.type
 
-    override fun llvm(): String =
+    override fun statementLlvm(): String =
         "add ${type.llvm} ${left.llvm()}, ${right.llvm()}"
 }
diff --git a/ryujin/src/commonMain/kotlin/statement/Memory.kt b/ryujin/src/commonMain/kotlin/statement/Memory.kt
@@ -11,7 +11,7 @@ class AllocateStatement(
 
     override val type: DragonType = DragonType.Pointer(allocationType)
 
-    override fun llvm(): String {
+    override fun statementLlvm(): String {
         return "alloca ${type.llvm}, align $alignment"
     }
 }
@@ -28,7 +28,7 @@ class StoreStatement(
         return target.type is DragonType.Pointer
     }
 
-    override fun llvm(): String {
+    override fun statementLlvm(): String {
         return "store ${value.type.llvm} ${value.llvm()}, ${target.type.llvm} ${target.llvm()}"
     }
 }
@@ -46,7 +46,7 @@ class CompositeStoreStatement(
         return uniqueType != null || (target.type as? DragonType.Pointer)?.type == uniqueType
     }
 
-    override fun llvm(): String {
+    override fun statementLlvm(): String {
         return "store ${uniqueType!!.llvm} ${values.joinToString(
             prefix = "[",
             separator = ", ",

diff --git a/ryujin/src/commonMain/kotlin/statement/Pointers.kt b/ryujin/src/commonMain/kotlin/statement/Pointers.kt
@@ -11,8 +11,8 @@ data class AssignStatement(
 ): DragonStatement {
     override val memoryDependencies: Set<Value> = setOf(memory) + value.memoryDependencies
 
-    override fun llvm(): String =
-        "%${memory.register} = ${value.llvm()}"
+    override fun statementLlvm(): String =
+        "%${memory.register} = ${value.statementLlvm()}"
 }
 
 data class GetElementPointerStatement(
@@ -21,7 +21,7 @@ data class GetElementPointerStatement(
     val index: Value,
     val total: Boolean = true,
     val inbounds: Boolean = true
-): TypedDragonStatement {
+): TypedDragonStatement, Value {
     override val memoryDependencies: Set<Value> = setOf(index, struct)
 
     val originalType = if (struct.type !is DragonType.Pointer) {
@@ -32,7 +32,7 @@ data class GetElementPointerStatement(
     val pointerType = DragonType.Pointer(originalType)
     override val type: DragonType = DragonType.Pointer(elementType)
 
-    override fun llvm(): String =
+    override fun statementLlvm(): String =
         "getelementptr " +
         (if (inbounds) {
             "inbounds "
@@ -44,6 +44,19 @@ data class GetElementPointerStatement(
         } else {
             ""
         }) + ", i32 ${index.llvm()}"
+
+    override fun llvm(): String =
+        "getelementptr " +
+                (if (inbounds) {
+                    "inbounds "
+                } else {
+                    ""
+                }) +
+                "(${originalType.llvm}, ${pointerType.llvm} ${struct.llvm()}" + (if (total) {
+            ", i32 0"
+        } else {
+            ""
+        }) + ", i32 ${index.llvm()})"
 }
 
 class LoadStatement(
@@ -56,7 +69,7 @@ class LoadStatement(
 
     override val type: DragonType = target.type.descendOneLevel()
 
-    override fun llvm(): String {
+    override fun statementLlvm(): String {
         require(isValid()) { "Cannot load from non-pointer type" }
         return "load ${type.llvm}, ${target.type.llvm} ${target.llvm()}"
     }

diff --git a/ryujin/src/commonMain/kotlin/struct/Value.kt b/ryujin/src/commonMain/kotlin/struct/Value.kt
@@ -1,6 +1,6 @@
 package me.gabriel.ryujin.struct
 
-sealed interface Value {
+interface Value {
     val type: DragonType
 
     fun llvm(): String

diff --git a/ryujin/src/commonMain/kotlin/transcript/DefaultDragonIrTranscriber.kt b/ryujin/src/commonMain/kotlin/transcript/DefaultDragonIrTranscriber.kt
@@ -29,7 +29,7 @@ class DefaultDragonIrTranscriber: DragonIrTranscriber {
             append("define ${function.returnType.llvm} @${function.name}(")
             append(function.parameters.joinToString(", ") { "${it.type.llvm} %${it.register}" })
             append(") {\n")
-            function.statements.forEach { append("  ${it.llvm()}\n") }
+            function.statements.forEach { append("  ${it.statementLlvm()}\n") }
             append("}")
         }
     }