New Timers for Daedalus' Phases

artifact/docker/Dockerfile

@@ -16,17 +16,17 @@ RUN apt install -y sudo \
 RUN python3 -m venv /src/venv-py
 ENV PATH="/src/venv-py/bin:$PATH"
 
-# Clone and Build LLVM 17
+# Clone and Build LLVM 17 with the Daedalus and func-merging patches
 RUN git clone --depth 100 -b merge-functions-pass https://github.com/Casperento/llvm-project.git 
 WORKDIR llvm-project
 RUN mkdir -p build
 RUN cmake -G Ninja \
-	-DLLVM_ENABLE_PROJECTS='clang;compiler-rt;lld' \
+	-DLLVM_ENABLE_PROJECTS='clang;lld' \
 	-DCMAKE_BUILD_TYPE="Release" \
 	-DLLVM_TARGETS_TO_BUILD=X86 \
 	-DLLVM_ENABLE_ASSERTIONS=On \
 	-S llvm -B build
-RUN cmake --build build -- -j 10
+RUN cmake --build build -- -j 20
 ENV PATH="/src/llvm-project/build/bin:$PATH"
 
 # Clone and Build Daedalus
@@ -49,24 +49,25 @@ WORKDIR /src
 RUN git clone https://github.com/Casperento/daedalus-dbg-toolkit.git
 RUN python3 -m pip install -r /src/daedalus-dbg-toolkit/requirements.txt
 
-# Build llvm with func-merging pass
-RUN git clone --depth 100 -b code-size https://github.com/rcorcs/llvm-project.git code-size
-WORKDIR code-size
-RUN mkdir -p build
-RUN cmake -G Ninja \
-	-DLLVM_ENABLE_PROJECTS='clang;compiler-rt;lld' \
-	-DCMAKE_BUILD_TYPE="Release" \
-	-DLLVM_TARGETS_TO_BUILD=X86 \
-	-DLLVM_ENABLE_ASSERTIONS=On \
-	-S llvm -B build
-RUN cmake --build build -- -j 10
+# Run experiment 1
 WORKDIR /src/daedalus-dbg-toolkit
-RUN ./run-experiment.sh -w 10 \
+RUN ./run-experiment.sh -w 20 \
+	-t 120 \
+	--llvm-project /src/llvm-project \
+	--llvm-test-suite /src/llvm-test-suite \
+	--daedalus /src/Daedalus \
+	--daedalus-branch main \
+	--lit-results /lit-results \
+	--errors-dbg /src/daedalus-dbg-toolkit \
+	--venv /src/venv-py
+
+# Run experiment 2
+RUN ./run-experiment-2.sh -w 20 \
 	-t 120 \
 	--llvm-project /src/llvm-project \
-	--code-size /src/code-size \
 	--llvm-test-suite /src/llvm-test-suite \
 	--daedalus /src/Daedalus \
+	--daedalus-branch main \
 	--lit-results /lit-results \
 	--errors-dbg /src/daedalus-dbg-toolkit \
 	--venv /src/venv-py

include/ProgramSlice.h

@@ -10,8 +10,8 @@
 #include <map>
 #include <set>
 
+#include "PHIGateAnalyzer.h"
 #include "llvm/Analysis/AliasAnalysis.h"
-
 #include "llvm/Analysis/LoopInfo.h"
 #include "llvm/Analysis/PostDominators.h"
 #include "llvm/IR/Dominators.h"
@@ -20,13 +20,11 @@
 #include "llvm/IR/PassManager.h"
 #include "llvm/Support/Error.h"
 
-// #include "llvm/Transforms/IPO/FunctionMerging.h"
-#include "PHIGateAnalyzer.h"
-
 namespace llvm {
 
 class ProgramSlice {
 public:
+  ProgramSlice() = default;
   /// Constructs a ProgramSlice object.
   ProgramSlice(Instruction &I, Function &F, FunctionAnalysisManager &FAM,
                std::unordered_map<const BasicBlock *,
@@ -53,9 +51,6 @@ class ProgramSlice {
   /// method as the SimplifyCFGPass
   static void simplifyCfg(Function *F, FunctionAnalysisManager &AM);
 
-  /// A function to merge two other functions using func-merging pass.
-  // static FunctionMergeResult mergeFunctions(Function *F1, Function *F2);
-
   /// Retrieves the current slice's parent function.
   Function *getParentFunction() const;
 

lib/ProgramSlice.cpp

@@ -1126,26 +1126,6 @@ void ProgramSlice::simplifyCfg(Function *F, FunctionAnalysisManager &AM) {
   }
 }
 
-/**
- * @brief A function to merge two other functions using func-merging pass
- *
- * @details This function runs the MergeFunctions function from the
- * func-merging
- *
- * @param F1 First pointer to the first Function to be merged.
- * @param F2 Second pointer to the first Function to be merged.
- * @return Function Merging Result object
- */
-// FunctionMergeResult ProgramSlice::mergeFunctions(Function *F1, Function
-// *F2)
-// {
-//     if (F1->getParent() != F2->getParent())
-//         return FunctionMergeResult(F1, F2, nullptr);
-//     FunctionMerger Merger(F1->getParent());
-//     FunctionMergingOptions Options = FunctionMergingOptions();
-//     return Merger.merge(F1, F2, "", Options);
-// }
-
 /**
  * @brief Adds a return instruction to the function F based on the initial
  * instruction.