Merge branch 'master' into benchmarks

Author: sjalander

.github/golden/hls-test-suite/decoupled/mergesort_decouple2.cycles

@@ -1 +1 @@
-13758
+13805

.github/golden/hls-test-suite/decoupled/mergesort_decouple3.cycles

@@ -1 +1 @@
-13766
+13813

.github/workflows/ClangTidy.yml

@@ -31,3 +31,6 @@ jobs:
 
       - name: "Run clang tidy"
         run: make tidy
+
+      - name: "Run check-includes"
+        run: make check-includes

Makefile.rules

@@ -168,29 +168,42 @@ endif
 ################################################################################
 # Documentation rules
 
+.PHONY: docclean docs
+
 docclean:
 	rm -rf doc
 
-docs: .PHONY
+docs:
 	mkdir -p docs
 	doxygen doxygen.conf
 
-.PHONY:
-
 #################################################################################
 # Clang format rules
 
+.PHONY: format format-dry-run
+
 format:
 	clang-format-$(LLVM_VERSION) --Werror --style="file:.clang-format" --verbose -i $(SOURCES) $(HEADERS)
 
 format-dry-run:
 	clang-format-$(LLVM_VERSION) --dry-run --Werror --style="file:.clang-format" --verbose -i $(SOURCES) $(HEADERS)
 
 #################################################################################
-# Clang tidy rules
+# Linting rules
+
+.PHONY: tidy check-includes
 
 tidy: $(COMMANDPATHSFILE)
 # Run clang-tidy in parallel on all source files and headers, halt on first error
 	parallel --halt now,fail=1 \
 	    clang-tidy-$(LLVM_VERSION) --config-file=.clang-tidy {} -- $(CXXFLAGS) $(CPPFLAGS) -I$(BUILD_OUT_PREFIX) \
 	    ::: $(HEADERS) $(SOURCES)
+
+
+check-includes:
+# Check that no #include statements use regular "-quoutes
+# Ignore files in rhls2firrtl as it contains strings used in code harness generation
+	@if ( git --no-pager grep -E "^#include \"" -- ":!jlm/hls/backend/rhls2firrtl" ); then \
+	  echo "error: failed due to the above #include directives using \"-style quotes"; \
+	  exit 1; \
+	fi

README.md

@@ -113,7 +113,7 @@ following articles:
 H. R. Krogstie, H. Bahmann, M. Själander, and N. Reissmann
 *"PIP: Making Andersen's Points-to Analysis Sound and Practical for Incomplete C Programs"*
 Proceedings of the ACM/IEEE International Conference on Code Generation and Optimization (CGO), Feb. 2026.
-https://www.arxiv.org/pdf/2512.07299
+https://doi.org/10.1109/CGO68049.2026.11395202
 
 D. Metz, N. Reissmann, and M. Själander
 *"R-HLS: An IR for Dynamic High-Level Synthesis and Memory Disambiguation based on Regions and State Edges"*

jlm/hls/backend/rvsdg2rhls/add-prints.cpp

@@ -59,8 +59,14 @@ convert_prints(llvm::LlvmRvsdgModule & rm)
   // TODO: make this less hacky by using the correct state types
   auto fct =
       rvsdg::FunctionType::Create({ rvsdg::BitType::Create(64), rvsdg::BitType::Create(64) }, {});
-  auto & printf =
-      llvm::LlvmGraphImport::Create(graph, fct, fct, "printnode", llvm::Linkage::externalLinkage);
+  auto & printf = llvm::LlvmGraphImport::Create(
+      graph,
+      fct,
+      fct,
+      "printnode",
+      llvm::Linkage::externalLinkage,
+      false,
+      1);
   convert_prints(root, &printf, fct);
 }
 
@@ -91,7 +97,11 @@ convert_prints(
         JLM_ASSERT(bt);
         val = &llvm::ZExtOperation::Create(*val, rvsdg::BitType::Create(64));
       }
-      llvm::CallOperation::Create(printf_local, functionType, { constantNode.output(0), val });
+      llvm::CallOperation::Create(
+          printf_local,
+          functionType,
+          llvm::AttributeList::createEmptyList(),
+          { constantNode.output(0), val });
       node->output(0)->divert_users(node->input(0)->origin());
       jlm::rvsdg::remove(node);
     }

jlm/hls/backend/rvsdg2rhls/hls-function-util.hpp

@@ -5,11 +5,12 @@
 #ifndef JLM_HLS_BACKEND_RVSDG2RHLS_HLS_FUNCTION_UTIL_HPP
 #define JLM_HLS_BACKEND_RVSDG2RHLS_HLS_FUNCTION_UTIL_HPP
 
-#include "jlm/llvm/ir/operators/IntegerOperations.hpp"
-#include <deque>
+#include <jlm/llvm/ir/operators/IntegerOperations.hpp>
 #include <jlm/llvm/ir/RvsdgModule.hpp>
 #include <jlm/rvsdg/lambda.hpp>
 
+#include <deque>
+
 namespace jlm::hls
 {
 bool

jlm/hls/backend/rvsdg2rhls/instrument-ref.cpp

@@ -97,13 +97,17 @@ instrument_ref(llvm::LlvmRvsdgModule & rm)
       loadFunctionType,
       loadFunctionType,
       "reference_load",
-      llvm::Linkage::externalLinkage);
+      llvm::Linkage::externalLinkage,
+      false,
+      1);
   auto & reference_store = llvm::LlvmGraphImport::Create(
       graph,
       loadFunctionType,
       loadFunctionType,
       "reference_store",
-      llvm::Linkage::externalLinkage);
+      llvm::Linkage::externalLinkage,
+      false,
+      1);
   // addr, size, memstate
   auto allocaFunctionType = jlm::rvsdg::FunctionType::Create(
       { jlm::llvm::PointerType::Create(),
@@ -116,7 +120,9 @@ instrument_ref(llvm::LlvmRvsdgModule & rm)
       allocaFunctionType,
       allocaFunctionType,
       "reference_alloca",
-      llvm::Linkage::externalLinkage);
+      llvm::Linkage::externalLinkage,
+      false,
+      1);
 
   instrument_ref(
       root,
@@ -182,6 +188,7 @@ instrument_ref(
       auto callOp = jlm::llvm::CallOperation::Create(
           load_func,
           loadFunctionType,
+          llvm::AttributeList::createEmptyList(),
           { addr, widthNode.output(0), ioState, memstate });
       // Divert the memory state of the load to the new memstate from the call operation
       node->input(1)->divert_to(callOp[1]);
@@ -216,6 +223,7 @@ instrument_ref(
       auto callOp = jlm::llvm::CallOperation::Create(
           alloca_func,
           allocaFunctionType,
+          llvm::AttributeList::createEmptyList(),
           { addr, sizeNode.output(0), ioState, memstate });
       for (auto ou : old_users)
       {
@@ -245,6 +253,7 @@ instrument_ref(
       auto callOp = jlm::llvm::CallOperation::Create(
           store_func,
           storeFunctionType,
+          llvm::AttributeList::createEmptyList(),
           { addr, widthNode.output(0), ioState, memstate });
       // Divert the memory state after the store to the new memstate from the call operation
       for (auto user : oldUsers)

jlm/hls/backend/rvsdg2rhls/rvsdg2rhls.cpp

@@ -63,14 +63,15 @@ split_opt(llvm::LlvmRvsdgModule & rm)
   // TODO: figure out which optimizations to use here
   jlm::llvm::DeadNodeElimination dne;
   CommonNodeElimination cne;
-  jlm::llvm::InvariantValueRedirection ivr;
+  constexpr llvm::InvariantValueRedirection::Configuration ivrConfiguration;
+  llvm::InvariantValueRedirection invariantValueRedirection(std::move(ivrConfiguration));
   llvm::LoopUnswitching loopUnswitching(llvm::LoopUnswitchingDefaultHeuristic::create());
   jlm::llvm::NodeReduction red;
   jlm::util::StatisticsCollector statisticsCollector;
   loopUnswitching.Run(rm, statisticsCollector);
   dne.Run(rm, statisticsCollector);
   cne.Run(rm, statisticsCollector);
-  ivr.Run(rm, statisticsCollector);
+  invariantValueRedirection.Run(rm, statisticsCollector);
   red.Run(rm, statisticsCollector);
   dne.Run(rm, statisticsCollector);
 }
@@ -81,13 +82,14 @@ pre_opt(jlm::llvm::LlvmRvsdgModule & rm)
   // TODO: figure out which optimizations to use here
   jlm::llvm::DeadNodeElimination dne;
   CommonNodeElimination cne;
-  jlm::llvm::InvariantValueRedirection ivr;
+  constexpr llvm::InvariantValueRedirection::Configuration ivrConfiguration;
+  llvm::InvariantValueRedirection invariantValueRedirection(std::move(ivrConfiguration));
   llvm::LoopUnswitching loopUnswitching(llvm::LoopUnswitchingDefaultHeuristic::create());
   jlm::util::StatisticsCollector statisticsCollector;
   loopUnswitching.Run(rm, statisticsCollector);
   dne.Run(rm, statisticsCollector);
   cne.Run(rm, statisticsCollector);
-  ivr.Run(rm, statisticsCollector);
+  invariantValueRedirection.Run(rm, statisticsCollector);
   dne.Run(rm, statisticsCollector);
   cne.Run(rm, statisticsCollector);
   dne.Run(rm, statisticsCollector);
@@ -207,7 +209,8 @@ rename_delta(rvsdg::DeltaNode * odn)
           name,
           llvm::Linkage::externalLinkage,
           "",
-          op->constant()));
+          op->constant(),
+          op->getAlignment()));
   /* add dependencies */
   rvsdg::SubstitutionMap rmap;
   for (auto ctxVar : odn->GetContextVars())
@@ -303,7 +306,9 @@ split_hls_function(llvm::LlvmRvsdgModule & rm, const std::string & function_name
               oldGraphImport->ValueType(),
               oldGraphImport->ImportedType(),
               oldGraphImport->Name(),
-              oldGraphImport->linkage());
+              oldGraphImport->linkage(),
+              oldGraphImport->isConstant(),
+              oldGraphImport->getAlignment());
           smap.insert(ln->input(i)->origin(), &newGraphImport);
           continue;
         }
@@ -331,7 +336,9 @@ split_hls_function(llvm::LlvmRvsdgModule & rm, const std::string & function_name
               op->Type(),
               llvm::PointerType::Create(),
               op->name(),
-              llvm::Linkage::externalLinkage);
+              llvm::Linkage::externalLinkage,
+              op->constant(),
+              op->getAlignment());
           smap.insert(ln->input(i)->origin(), &graphImport);
           // add export for delta to rm
           // TODO: check if not already exported and maybe adjust linkage?
@@ -354,7 +361,9 @@ split_hls_function(llvm::LlvmRvsdgModule & rm, const std::string & function_name
           op.Type(),
           op.Type(),
           op.name(),
-          llvm::Linkage::externalLinkage); // TODO: change linkage?
+          llvm::Linkage::externalLinkage, // TODO: change linkage?
+          false,
+          1);
       ln->output()->divert_users(&graphImport);
       remove(ln);
       std::cout << "function "
@@ -378,7 +387,8 @@ createTransformationSequence(rvsdg::DotWriter & dotWriter, const bool dumpRvsdgD
   auto predicateCorrelation = std::make_shared<llvm::PredicateCorrelation>();
   auto deadNodeElimination = std::make_shared<llvm::DeadNodeElimination>();
   auto commonNodeElimination = std::make_shared<CommonNodeElimination>();
-  auto invariantValueRedirection = std::make_shared<llvm::InvariantValueRedirection>();
+  auto invariantValueRedirection = std::make_shared<llvm::InvariantValueRedirection>(
+      llvm::InvariantValueRedirection::Configuration());
   auto loopUnswitching =
       std::make_shared<llvm::LoopUnswitching>(llvm::LoopUnswitchingDefaultHeuristic::create());
   auto ioBarrierRemoval = std::make_shared<IOBarrierRemoval>();

jlm/llvm/Makefile.sub

@@ -10,7 +10,6 @@ libllvm_SOURCES = \
     \
     jlm/llvm/frontend/ControlFlowRestructuring.cpp \
     jlm/llvm/frontend/InterProceduralGraphConversion.cpp \
-    jlm/llvm/frontend/LlvmInstructionConversion.cpp \
     jlm/llvm/frontend/LlvmModuleConversion.cpp \
     \
     jlm/llvm/ir/aggregation.cpp \
@@ -67,6 +66,7 @@ libllvm_SOURCES = \
     jlm/llvm/opt/inlining.cpp \
     jlm/llvm/opt/InvariantValueRedirection.cpp \
     jlm/llvm/opt/LoadChainSeparation.cpp \
+    jlm/llvm/opt/LoopStrengthReduction.cpp \
     jlm/llvm/opt/LoopUnswitching.cpp \
     jlm/llvm/opt/PredicateCorrelation.cpp \
     jlm/llvm/opt/pull.cpp \
@@ -113,15 +113,14 @@ libllvm_HEADERS = \
     jlm/llvm/opt/IfConversion.hpp \
     jlm/llvm/opt/InvariantValueRedirection.hpp \
     jlm/llvm/opt/LoadChainSeparation.hpp \
+    jlm/llvm/opt/LoopStrengthReduction.hpp \
     jlm/llvm/opt/LoopUnswitching.hpp \
     jlm/llvm/opt/PredicateCorrelation.hpp \
     jlm/llvm/opt/RvsdgTreePrinter.hpp \
     jlm/llvm/opt/ScalarEvolution.hpp \
     jlm/llvm/opt/StoreValueForwarding.hpp \
     jlm/llvm/frontend/LlvmModuleConversion.hpp \
     jlm/llvm/frontend/ControlFlowRestructuring.hpp \
-    jlm/llvm/frontend/LlvmConversionContext.hpp \
-    jlm/llvm/frontend/LlvmInstructionConversion.hpp \
     jlm/llvm/frontend/InterProceduralGraphConversion.hpp \
     jlm/llvm/ir/operators.hpp \
     jlm/llvm/ir/ipgraph-module.hpp \
@@ -169,6 +168,7 @@ tests/jlm/llvm/run-libllvm-tests_SOURCES = \
     tests/jlm/llvm/backend/IpGraphToLlvmConverterTests.cpp \
     tests/jlm/llvm/backend/RvsdgToIpGraphConverterTests.cpp \
     \
+    tests/jlm/llvm/frontend/llvm/CastingTests.cpp \
     tests/jlm/llvm/frontend/llvm/ControlFlowRestructuringTests.cpp \
     tests/jlm/llvm/frontend/llvm/LoadTests.cpp \
     tests/jlm/llvm/frontend/llvm/MemCpyTests.cpp \
@@ -231,6 +231,7 @@ tests/jlm/llvm/run-libllvm-tests_SOURCES = \
     tests/jlm/llvm/opt/IfConversionTests.cpp \
     tests/jlm/llvm/opt/InvariantValueRedirectionTests.cpp \
     tests/jlm/llvm/opt/LoadChainSeparationTests.cpp \
+    tests/jlm/llvm/opt/LoopStrengthReductionTests.cpp \
     tests/jlm/llvm/opt/LoopUnswitchingTests.cpp \
     tests/jlm/llvm/opt/NodeReductionTests.cpp \
     tests/jlm/llvm/opt/PredicateCorrelationTests.cpp \