Add support for LLVM 16 and clean up

.gitignore

@@ -2,4 +2,6 @@ test/**/*gt/*
 **/__pycache__
 /Dockerfile*
 env
-build
+build
+**/*.bc
+**/*.ll

README.md

@@ -16,47 +16,40 @@ cd gametime
 git submodule update --init --recursive
 ```
 
-### 2. Install LLVM and Clang (Version 13)
+### 2. Install LLVM and Clang (Version 16)
 
-Gametime requires LLVM and Clang version 13. The installation instructions differ slightly between Linux and macOS:
+Gametime requires LLVM and Clang version 16. The installation instructions differ slightly between Linux and macOS:
 
 #### On Linux (Ubuntu/Debian):
 Update your package manager and install LLVM and Clang version 13:
 
 ```bash
 sudo apt update
-sudo apt install clang-13 llvm-13
+sudo apt install clang-16 llvm-16
 ```
 
 Ensure that version 13 is used by setting it as the default:
 
 ```bash
-sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-13 100
-sudo update-alternatives --install /usr/bin/llvm-config llvm-config /usr/bin/llvm-config-13 100
+sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-16 100
+sudo update-alternatives --install /usr/bin/llvm-config llvm-config /usr/bin/llvm-config-16 100
 ```
 
 #### On macOS:
-First, ensure that Homebrew is installed, then install LLVM version 13 using the following commands:
+First, ensure that Homebrew is installed, then install LLVM version 16 using the following commands:
 
 ```bash
-brew install llvm@13
+brew install llvm@16
 ```
 
 After installation, update your `PATH` to include LLVM version 13:
 
 ```bash
-export PATH="/usr/local/opt/llvm@13/bin:$PATH"
+export PATH="/usr/local/opt/llvm@16/bin:$PATH"
 ```
 
 ### 3. Install Extra Dependencies and Local Modules
 
-Install the required Python packages and additional system libraries:
-
-```bash
-pip install -e .
-pip install -r requirements.txt
-```
-
 #### On Linux (Ubuntu/Debian):
 Install additional system libraries:
 
@@ -71,6 +64,15 @@ Install the additional libraries via Homebrew:
 brew install graphviz
 ```
 
+#### Install Python dependencies:
+
+Install the required Python packages and additional system libraries:
+
+```bash
+pip install -e .
+pip install -r requirements.txt
+```
+
 If you are having trouble installing pygraphviz on macOS try the following: [StackOverflow](https://stackoverflow.com/questions/69970147/how-do-i-resolve-the-pygraphviz-error-on-mac-os)
 
 ### 4. Install KLEE
@@ -89,7 +91,7 @@ Each test requires a YAML configuration file. Ensure that your YAML file is corr
 
 ### 2. Create a Test Class
 
-Navigate to the `wcet.py` file and create a new test class based on one of the available backend configurations. Specify the path to your YAML configuration file in the `config_path` attribute.
+Navigate to the `wcet_test.py` file and create a new test class based on one of the available backend configurations. Specify the path to your YAML configuration file in the `config_path` attribute.
 
 #### Example:
 
@@ -100,7 +102,7 @@ class TestBinarysearchARM(TestARMBackend):
 
 ### 3. Add the Test Class to the Main Function
 
-In the `main` function of `wcet.py`, add your newly created test class to the suite for execution.
+In the `main` function of `wcet_test.py`, add your newly created test class to the suite for execution.
 
 #### Example:
 
@@ -113,7 +115,7 @@ suite.addTests(loader.loadTestsFromTestCase(TestBinarysearchARM))
 Run the test using the following command:
 
 ```bash
-python wcet.py
+python wcet_test.py
 ```
 
 ---

src/clang_helper.py

@@ -204,6 +204,7 @@ def inline_functions(bc_filepath: str, output_file_folder: str, output_name: str
     output_file: str = os.path.join(output_file_folder, f"{output_name}.bc")
 
     commands: List[str] = ["opt",
+                "-enable-new-pm=0",
                 "-always-inline",
                 "-inline", "-inline-threshold=10000000",
                 "-S", bc_filepath,
@@ -242,6 +243,7 @@ def unroll_loops(bc_filepath: str, output_file_folder: str, output_name: str, pr
     output_file: str = os.path.join(output_file_folder, f"{output_name}.bc")
 
     commands: List[str] = ["opt",
+                "-enable-new-pm=0",
                 # "-mem2reg",
                 "-simplifycfg",
                 "-loops",

src/inliner.py

@@ -72,7 +72,7 @@ def assemble_bitcode(input_file, output_file):
     run_command(f"llvm-as {input_file} -o {output_file}")
 
 def inline_bitcode(input_file, output_file):
-    run_command(f"opt -always-inline -inline -inline-threshold=10000000 {input_file} -o {output_file}")
+    run_command(f"opt -enable-new-pm=0 -always-inline -inline -inline-threshold=10000000 {input_file} -o {output_file}")
 
 def generate_cfg(input_file):
     run_command(f"opt -dot-cfg {input_file}")

src/smt_solver/.gitignore

@@ -0,0 +1 @@
+modify_bitcode

src/unroller.py

@@ -33,7 +33,7 @@ def unroll_llvm_ir(input_ir, output_ir):
     """
     Generate LLVM Intermediate Representation (.ll file) from LLVM bitcode.
     """
-    command = f"opt -loop-unroll -S {input_ir} -o {output_ir}"
+    command = f"opt -enable-new-pm=0 -loop-unroll -S {input_ir} -o {output_ir}"
     run_command(command, f"Generating LLVM IR from {input_ir}")
 
 

test/tacle_test/programs/ext_func/ext_lib_test/inline.py

@@ -44,7 +44,7 @@ def assemble_bitcode(input_file, output_file):
     run_command(f"llvm-as {input_file} -o {output_file}")
 
 def inline_functions(input_file, output_file):
-    run_command(f"opt -always-inline -inline -inline-threshold=10000000 {input_file} -o {output_file}")
+    run_command(f"opt -enable-new-pm=0 -always-inline -inline -inline-threshold=10000000 {input_file} -o {output_file}")
 
 def generate_cfg(input_file):
     run_command(f"opt -dot-cfg {input_file}")

test/tacle_test/programs/if_elif_else/helper.c

@@ -1,4 +1,3 @@
-#include "helper.h"
 #include <stdio.h>
 
 int abs(int x) {

test/tacle_test/programs/if_elif_else/if_elif_else.c

@@ -2,7 +2,8 @@
 #include <stdbool.h>
 #include <unistd.h>
 #include <stdio.h>
-#include </Users/abdallaeltayeb/Desktop/Gamtime_project/gametime/test/tacle_test/programs/if_elif_else/helper.h>
+
+int abs(int x);
 
 // int test (int x) {
 //    // if (x < 0 && b < 0) {

test/tacle_test/programs/loops/convert.py

@@ -33,7 +33,7 @@ def unroll_llvm_ir(input_ir, output_ir):
     """
     Generate LLVM Intermediate Representation (.ll file) from LLVM bitcode.
     """
-    command = f"opt -loop-unroll -S {input_ir} -o {output_ir}"
+    command = f"opt -enable-new-pm=0 -loop-unroll -S {input_ir} -o {output_ir}"
     run_command(command, f"Generating LLVM IR from {input_ir}")
 
 

test/tacle_test/wcet_test.py

@@ -127,9 +127,9 @@ class TestCountNegativeARM(TestARMBackend):
     # suite.addTests(loader.loadTestsFromTestCase(TestPrimeFlexpret))
     # suite.addTests(loader.loadTestsFromTestCase(TestIfElifElseX86))
     # suite.addTests(loader.loadTestsFromTestCase(TestBinarysearchARM))
-    # suite.addTests(loader.loadTestsFromTestCase(TestIfElifElseARM))
+    suite.addTests(loader.loadTestsFromTestCase(TestIfElifElseARM))
     # suite.addTests(loader.loadTestsFromTestCase(TestPrimeARM))
-    suite.addTests(loader.loadTestsFromTestCase(TestCountNegativeARM))
+    # suite.addTests(loader.loadTestsFromTestCase(TestCountNegativeARM))
 
     runner = unittest.TextTestRunner()
     runner.run(suite)