LLVMCodeBuilder: Add addLoopIndex() method

Author: adazem009

src/dev/engine/internal/icodebuilder.h

@@ -23,6 +23,7 @@ class ICodeBuilder
         virtual CompilerValue *addTargetFunctionCall(const std::string &functionName, Compiler::StaticType returnType, const Compiler::ArgTypes &argTypes, const Compiler::Args &args) = 0;
         virtual CompilerValue *addFunctionCallWithCtx(const std::string &functionName, Compiler::StaticType returnType, const Compiler::ArgTypes &argTypes, const Compiler::Args &args) = 0;
         virtual CompilerConstant *addConstValue(const Value &value) = 0;
+        virtual CompilerValue *addLoopIndex() = 0;
         virtual CompilerValue *addVariableValue(Variable *variable) = 0;
         virtual CompilerValue *addListContents(List *list) = 0;
         virtual CompilerValue *addListItem(List *list, CompilerValue *index) = 0;

src/dev/engine/internal/llvm/llvmcodebuilder.cpp

@@ -822,6 +822,14 @@ std::shared_ptr<ExecutableCode> LLVMCodeBuilder::finalize()
                 break;
             }
 
+            case LLVMInstruction::Type::LoopIndex: {
+                assert(!loops.empty());
+                LLVMLoop &loop = loops.back();
+                llvm::Value *index = m_builder.CreateLoad(m_builder.getInt64Ty(), loop.index);
+                step.functionReturnReg->value = m_builder.CreateUIToFP(index, m_builder.getDoubleTy());
+                break;
+            }
+
             case LLVMInstruction::Type::BeginWhileLoop: {
                 assert(!loops.empty());
                 LLVMLoop &loop = loops.back();
@@ -993,6 +1001,11 @@ CompilerConstant *LLVMCodeBuilder::addConstValue(const Value &value)
     return static_cast<CompilerConstant *>(addReg(reg));
 }
 
+CompilerValue *LLVMCodeBuilder::addLoopIndex()
+{
+    return createOp(LLVMInstruction::Type::LoopIndex, Compiler::StaticType::Number, {}, {});
+}
+
 CompilerValue *LLVMCodeBuilder::addVariableValue(Variable *variable)
 {
     LLVMInstruction ins(LLVMInstruction::Type::ReadVariable);

src/dev/engine/internal/llvm/llvmcodebuilder.h

@@ -30,6 +30,7 @@ class LLVMCodeBuilder : public ICodeBuilder
         CompilerValue *addTargetFunctionCall(const std::string &functionName, Compiler::StaticType returnType, const Compiler::ArgTypes &argTypes, const Compiler::Args &args) override;
         CompilerValue *addFunctionCallWithCtx(const std::string &functionName, Compiler::StaticType returnType, const Compiler::ArgTypes &argTypes, const Compiler::Args &args) override;
         CompilerConstant *addConstValue(const Value &value) override;
+        CompilerValue *addLoopIndex() override;
         CompilerValue *addVariableValue(Variable *variable) override;
         CompilerValue *addListContents(List *list) override;
         CompilerValue *addListItem(List *list, CompilerValue *index) override;

src/dev/engine/internal/llvm/llvminstruction.h

@@ -58,6 +58,7 @@ struct LLVMInstruction
             BeginElse,
             EndIf,
             BeginRepeatLoop,
+            LoopIndex,
             BeginWhileLoop,
             BeginRepeatUntilLoop,
             BeginLoopCondition,

test/dev/llvm/llvmcodebuilder_test.cpp

@@ -2907,7 +2907,8 @@ TEST_F(LLVMCodeBuilderTest, RepeatLoop)
     v = m_builder->addConstValue(2);
     v = callConstFuncForType(ValueType::Number, v);
     m_builder->beginRepeatLoop(v);
-    m_builder->addTargetFunctionCall("test_function_no_args", Compiler::StaticType::Void, {}, {});
+    CompilerValue *index = m_builder->addLoopIndex();
+    m_builder->addTargetFunctionCall("test_print_number", Compiler::StaticType::Void, { Compiler::StaticType::Number }, { index });
     m_builder->endLoop();
 
     // Nested
@@ -2928,8 +2929,8 @@ TEST_F(LLVMCodeBuilderTest, RepeatLoop)
         v = m_builder->addConstValue(3);
         m_builder->beginRepeatLoop(v);
         {
-            v = m_builder->addConstValue(3);
-            m_builder->addTargetFunctionCall("test_function_1_arg", Compiler::StaticType::Void, { Compiler::StaticType::String }, { v });
+            index = m_builder->addLoopIndex();
+            m_builder->addTargetFunctionCall("test_print_number", Compiler::StaticType::Void, { Compiler::StaticType::Number }, { index });
         }
         m_builder->endLoop();
     }
@@ -2950,20 +2951,20 @@ TEST_F(LLVMCodeBuilderTest, RepeatLoop)
         "1_arg 1\n"
         "1_arg 1\n"
         "1_arg 1\n"
-        "no_args\n"
-        "no_args\n"
+        "0\n"
+        "1\n"
         "1_arg 1\n"
         "1_arg 1\n"
         "1_arg 2\n"
-        "1_arg 3\n"
-        "1_arg 3\n"
-        "1_arg 3\n"
+        "0\n"
+        "1\n"
+        "2\n"
         "1_arg 1\n"
         "1_arg 1\n"
         "1_arg 2\n"
-        "1_arg 3\n"
-        "1_arg 3\n"
-        "1_arg 3\n";
+        "0\n"
+        "1\n"
+        "2\n";
 
     EXPECT_CALL(m_target, isStage).WillRepeatedly(Return(false));
     testing::internal::CaptureStdout();

test/mocks/codebuildermock.h

@@ -13,6 +13,7 @@ class CodeBuilderMock : public ICodeBuilder
         MOCK_METHOD(CompilerValue *, addTargetFunctionCall, (const std::string &, Compiler::StaticType, const Compiler::ArgTypes &, const Compiler::Args &), (override));
         MOCK_METHOD(CompilerValue *, addFunctionCallWithCtx, (const std::string &, Compiler::StaticType, const Compiler::ArgTypes &, const Compiler::Args &), (override));
         MOCK_METHOD(CompilerConstant *, addConstValue, (const Value &), (override));
+        MOCK_METHOD(CompilerValue *, addLoopIndex, (), (override));
         MOCK_METHOD(CompilerValue *, addVariableValue, (Variable *), (override));
         MOCK_METHOD(CompilerValue *, addListContents, (List *), (override));
         MOCK_METHOD(CompilerValue *, addListItem, (List *, CompilerValue *), (override));