Added the 'inline' attribute

Kaisia-Estrel · May 14, 2023 · 25d5b09 · 25d5b09
1 parent f3db87f
commit 25d5b09
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 12 deletions.
diff --git a/bench/fib/fib b/bench/fib/fib
diff --git a/bench/fib/fib.cpp b/bench/fib/fib.cpp
@@ -1,7 +1,7 @@
 #include <cstdio>
 #include <cstdint>
 
-static uint64_t fib(uint64_t n) {
+uint64_t fib(uint64_t n) {
   if (n <= 1) return n;
   return fib(n - 1) + fib(n - 2);
 }

diff --git a/bench/fib/fib.sn b/bench/fib/fib.sn
@@ -1,8 +1,7 @@
 use Core::System
 
-fn fib(n: i64) i64 {
+static fn [[inline]] fib(n: i64) i64 {
     if n <= 1 {
-        let a = 2
         return n
     }
 

diff --git a/bench/fib/run.rb b/bench/fib/run.rb
@@ -46,8 +46,10 @@ def total_time
 
 languages << Language.new("sn", "snowball (compiled)", :compiled, "snowball build -f fib.sn -o O3", "./.sn/bin/out.o")
 
-languages << Language.new("c", "C", :compiled, "gcc -O3 -o fib fib.c", "./fib")
-languages << Language.new("cpp", "C++", :compiled, "clang++ -O3 -o fib fib.cpp", "./fib")
+languages << Language.new("c (gnu)", "C", :compiled, "gcc -O3 -o fib fib.c", "./fib")
+languages << Language.new("c (clang)", "C", :compiled, "clang-14 -O3 -o fib fib.c", "./fib")
+languages << Language.new("cpp (gnu)", "C++", :compiled, "g++ -O3 -o fib fib.cpp", "./fib")
+languages << Language.new("cpp (clang)", "C++", :compiled, "clang++-14 -O3 -o fib fib.cpp", "./fib")
 
 languages << Language.new("py3", "Python3", :interpreted, "", "python3 fib.py")
 

diff --git a/src/ast/syntax/common.h b/src/ast/syntax/common.h
@@ -19,6 +19,7 @@ namespace Attributes {
 enum Fn {
     LLVM_FUNC,
     INTERNAL_LINKAGE,
+    INLINE,
 };
 }
 

diff --git a/src/builder/llvm/createLLVMFunction.cc b/src/builder/llvm/createLLVMFunction.cc
@@ -28,7 +28,17 @@ llvm::Function *LLVMBuilder::createLLVMFunction(ir::Func *func) {
               ? llvm::Function::InternalLinkage
               : llvm::Function::ExternalLinkage,
           name, module.get());
-    auto callee = (llvm::Function *)(fn);
+
+    auto callee = (llvm::Function *)fn;
+
+    auto attrSet = callee->getAttributes();
+
+    if (func->hasAttribute(Attributes::INLINE)) {
+        auto newAttrSet = attrSet.addFnAttribute(
+            callee->getContext(), llvm::Attribute::AlwaysInline);
+        callee->setAttributes(newAttrSet);
+        // TODO: other attributes
+    }
 
     if (!ir::Func::isExternal(func->getMangle()) ||
         func->getMangle() == "main") {

diff --git a/src/parser/parseFunction.cc b/src/parser/parseFunction.cc
@@ -70,6 +70,8 @@ FunctionDef *Parser::parseFunction(bool isConstructor, bool isOperator,
                 isLLVMFunction = true;
             } else if (attr == "internal_linkage") {
                 attributes.push_back(Attributes::Fn::INTERNAL_LINKAGE);
+            } else if (attr == "inline") {
+                attributes.push_back(Attributes::Fn::INLINE);
             } else {
                 createError<ATTRIBUTE_ERROR>(
                     "Trying to use an undefined attribute!",

diff --git a/tests/main.sn b/tests/main.sn
@@ -1,13 +1,11 @@
 use Core::System
 
-fn fib(n: i64) i64 {
-    if n <= 1 {
-        return n
+fn hello() {
+    asm {
+        mov arx, blah blah boring who tf cares about assembly
     }
-
-    return fib(n-1) + fib(n-2)
 }
 
 pub fn main() i32 {
-    System::println(fib(47 as i64))
+    hello()
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,6 +19,7 @@ namespace Attributes { @@
     enum Fn {
         LLVM_FUNC,
         INTERNAL_LINKAGE,
+        INLINE,
     };
     }
@@ Expand Down @@