Merge branch 'dev-v1.0' of github.com:JonathanSalwan/Triton into dev-…

…v1.0
cnheitman · Sep 3, 2023 · b18e461 · b18e461
2 parents 145feb8 + 04fd303
commit b18e461
Show file tree

Hide file tree

Showing 9 changed files with 258 additions and 197 deletions.
diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml
@@ -10,7 +10,7 @@ jobs:
         python-version: [3.9]
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v4

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -6,6 +6,6 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Build the Docker image
       run: docker build . --file Dockerfile --tag triton-docker:$(date +%s)
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -12,7 +12,7 @@ jobs:
         capstone-version: ['5.0-rc2', '4.0.2']
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v4

diff --git a/.github/workflows/osx.yml b/.github/workflows/osx.yml
@@ -10,7 +10,7 @@ jobs:
         python-version: ['3.7', '3.8', '3.9', '3.10']
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v4

diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml
@@ -19,35 +19,35 @@ jobs:
         run: |
          docker run \
                 --rm \
-                -v $GITHUB_WORKSPACE:/src \
+                --volume $GITHUB_WORKSPACE:/src \
                 build-triton-linux-x86_64 bash /src/src/scripts/docker/build-wheel-linux.sh
 
       - name: Upload Wheel packages (Python 3.8)
         uses: actions/upload-artifact@v3
         with:
-          name: triton_library-${{ env.package-version }}-cp38-cp38-manylinux_2_24_x86_64.whl
-          path: wheel-final/triton_library-${{ env.package-version }}-cp38-cp38-manylinux_2_24_x86_64.whl
+          name: triton_library-${{ env.package-version }}-cp38-cp38-manylinux_2_28_x86_64.whl
+          path: wheelhouse/manylinux_2_28_x86_64/triton_library-${{ env.package-version }}-cp38-cp38-manylinux_2_28_x86_64.whl
           if-no-files-found: warn
 
       - name: Upload Wheel packages (Python 3.9)
         uses: actions/upload-artifact@v3
         with:
-          name: triton_library-${{ env.package-version }}-cp39-cp39-manylinux_2_24_x86_64.whl
-          path: wheel-final/triton_library-${{ env.package-version }}-cp39-cp39-manylinux_2_24_x86_64.whl
+          name: triton_library-${{ env.package-version }}-cp39-cp39-manylinux_2_28_x86_64.whl
+          path: wheelhouse/manylinux_2_28_x86_64/triton_library-${{ env.package-version }}-cp39-cp39-manylinux_2_28_x86_64.whl
           if-no-files-found: warn
 
       - name: Upload Wheel packages (Python 3.10)
         uses: actions/upload-artifact@v3
         with:
-          name: triton_library-${{ env.package-version }}-cp310-cp310-manylinux_2_24_x86_64.whl
-          path: wheel-final/triton_library-${{ env.package-version }}-cp310-cp310-manylinux_2_24_x86_64.whl
+          name: triton_library-${{ env.package-version }}-cp310-cp310-manylinux_2_28_x86_64.whl
+          path: wheelhouse/manylinux_2_28_x86_64/triton_library-${{ env.package-version }}-cp310-cp310-manylinux_2_28_x86_64.whl
           if-no-files-found: warn
 
       - name: Upload Wheel packages (Python 3.11)
         uses: actions/upload-artifact@v3
         with:
-          name: triton_library-${{ env.package-version }}-cp311-cp311-manylinux_2_24_x86_64.whl
-          path: wheel-final/triton_library-${{ env.package-version }}-cp311-cp311-manylinux_2_24_x86_64.whl
+          name: triton_library-${{ env.package-version }}-cp311-cp311-manylinux_2_28_x86_64.whl
+          path: wheelhouse/manylinux_2_28_x86_64/triton_library-${{ env.package-version }}-cp311-cp311-manylinux_2_28_x86_64.whl
           if-no-files-found: warn
 
 
@@ -130,130 +130,127 @@ jobs:
   #         if-no-files-found: warn
 
 
-  # FIXME
-  #build-macos:
-  #  runs-on: macos-latest
-  #  strategy:
-  #    matrix:
-  #      python-version: ['3.8', '3.9', '3.10']
-  #      include:
-  #        - python-version: 3.8
-  #        - python-version: 3.9
-  #        - python-version: 3.10
-  #  steps:
-  #    - name: Checkout
-  #      uses: actions/checkout@v2
-
-  #    - name: Set up Python ${{ matrix.python-version }}
-  #      uses: actions/setup-python@v4
-  #      with:
-  #        python-version: ${{ matrix.python-version }}
-
-  #    - name: Install LLVM and Clang
-  #      uses: KyleMayes/install-llvm-action@v1
-  #      with:
-  #        version: "14.0"
-  #        directory: ${{ runner.temp }}/llvm
-
-  #    - name: Upgrade pip version
-  #      run: |
-  #        sudo python -m pip install -U pip
-
-  #    - name: Install build package
-  #      run: |
-  #        sudo python -m pip install build
-
-  #    - name: Download and build GMP
-  #      run: |
-  #        wget https://gmplib.org/download/gmp/gmp-6.2.1.tar.xz
-  #        tar xvf gmp-6.2.1.tar.xz
-  #        cd gmp-6.2.1/
-  #        ./configure --enable-cxx
-  #        make
-  #        make check
-  #        make install
-
-  #    - name: Download and build Bitwuzla
-  #      run: |
-  #        git clone https://github.com/bitwuzla/bitwuzla.git
-  #        cd bitwuzla
-  #        ./contrib/setup-cadical.sh
-  #        ./contrib/setup-btor2tools.sh
-  #        ./contrib/setup-symfpu.sh
-  #        ./configure.sh --shared --prefix $(pwd)/install
-  #        cd build
-  #        make
-  #        make install
-
-  #    - name: Download Z3
-  #      run: |
-  #        wget https://github.com/Z3Prover/z3/releases/download/z3-4.8.17/z3-4.8.17-x64-osx-10.16.zip
-  #        unzip z3-4.8.17-x64-osx-10.16.zip
-
-  #    - name: Install Capstone
-  #      run: |
-  #        wget https://github.com/aquynh/capstone/archive/4.0.2.tar.gz
-  #        tar -xf ./4.0.2.tar.gz
-  #        cd ./capstone-4.0.2
-  #        bash ./make.sh
-  #        sudo make install
-  #        cd ../
-
-  #    - name: Build Triton Python package
-  #      run: python -m build --wheel
-  #      env:
-  #        PYTHON_VERSION: ${{ matrix.python-version }}
-  #        PYTHON_LIBRARIES: ${{ env.pythonLocation }}/lib/libpython${{ matrix.python-version }}.dylib
-  #        PYTHON_LIBRARY: ${{ env.pythonLocation }}/lib/libpython${{ matrix.python-version }}.dylib
-  #        PYTHON_INCLUDE_DIRS: ${{ env.pythonLocation }}/include/python${{ matrix.python-version }}
-  #        Z3_INCLUDE_DIRS: ${{ github.workspace }}/z3-4.8.17-x64-osx-10.16/include
-  #        Z3_LIBRARIES: ${{ github.workspace }}/z3-4.8.17-x64-osx-10.16/bin/libz3.a
-  #        CAPSTONE_INCLUDE_DIRS: /usr/local/include
-  #        CAPSTONE_LIBRARIES: /usr/local/lib/libcapstone.a
-  #        BITWUZLA_INTERFACE: On
-  #        BITWUZLA_INCLUDE_DIRS: ${{ github.workspace }}/bitwuzla/install/include
-  #        BITWUZLA_LIBRARIES: ${{ github.workspace }}/bitwuzla/install/lib/libbitwuzla.dylib
-  #        LLVM_INTERFACE: On
-  #        CMAKE_PREFIX_PATH: ${{env.LLVM_PATH}}
-
-  #    - name: Repair wheel package (Python 3.8)
-  #      if: ${{ matrix.python-version == '3.8' }}
-  #      run: |
-  #        pip install delocate
-  #        delocate-wheel -w wheel-final -v ${{ github.workspace }}/dist/triton_library-${{ env.package-version }}-cp38-cp38-macosx_11_0_x86_64.whl
-
-  #    - name: Upload Wheel packages (Python 3.8)
-  #      uses: actions/upload-artifact@v3
-  #      if: ${{ matrix.python-version == '3.8' }}
-  #      with:
-  #        name: triton_library-${{ env.package-version }}-cp38-cp38-macosx_11_0_x86_64.whl
-  #        path: ${{ github.workspace }}/wheel-final/triton_library-${{ env.package-version }}-cp38-cp38-macosx_11_0_x86_64.whl
-  #        if-no-files-found: warn
-
-  #    - name: Repair wheel package (Python 3.9)
-  #      if: ${{ matrix.python-version == '3.9' }}
-  #      run: |
-  #        pip install delocate
-  #        delocate-wheel -w wheel-final -v ${{ github.workspace }}/dist/triton_library-${{ env.package-version }}-cp39-cp39-macosx_11_0_x86_64.whl
-
-  #    - name: Upload Wheel packages (Python 3.9)
-  #      uses: actions/upload-artifact@v3
-  #      if: ${{ matrix.python-version == '3.9' }}
-  #      with:
-  #        name: triton_library-${{ env.package-version }}-cp39-cp39-macosx_11_0_x86_64.whl
-  #        path: ${{ github.workspace }}/wheel-final/triton_library-${{ env.package-version }}-cp39-cp39-macosx_11_0_x86_64.whl
-  #        if-no-files-found: warn
-
-  #    - name: Repair wheel package (Python 3.10)
-  #      if: ${{ matrix.python-version == '3.10' }}
-  #      run: |
-  #        pip install delocate
-  #        delocate-wheel -w wheel-final -v ${{ github.workspace }}/dist/triton_library-${{ env.package-version }}-cp310-cp310-macosx_11_0_x86_64.whl
-
-  #    - name: Upload Wheel packages (Python 3.10)
-  #      uses: actions/upload-artifact@v3
-  #      if: ${{ matrix.python-version == '3.10' }}
-  #      with:
-  #        name: triton_library-${{ env.package-version }}-cp310-cp310-macosx_11_0_x86_64.whl
-  #        path: ${{ github.workspace }}/wheel-final/triton_library-${{ env.package-version }}-cp310-cp310-macosx_11_0_x86_64.whl
-  #        if-no-files-found: warn
+  build-macos:
+    runs-on: macos-latest
+    strategy:
+      matrix:
+        python-version: ['3.8', '3.9', '3.10']
+        include:
+          - python-version: 3.8
+            pycp: cp38-cp38
+          - python-version: 3.9
+            pycp: cp39-cp39
+          - python-version: 3.10
+            pycp: cp310-cp310
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Install LLVM and Clang
+        uses: KyleMayes/[email protected]
+        with:
+          version: "14.0"
+          directory: ${{ runner.temp }}/llvm
+
+      - name: Upgrade pip version
+        run: |
+          sudo python -m pip install -U pip
+
+      - name: Install build package
+        run: |
+          sudo python -m pip install build
+
+      - name: Download and build GMP
+        run: |
+          wget -q https://ftp.gnu.org/gnu/gmp/gmp-6.2.1.tar.xz
+          tar -xf gmp-6.2.1.tar.xz
+          cd gmp-6.2.1
+          ./configure --enable-cxx
+          make
+          make install
+
+      - name: Install Ninja
+        run: |
+          brew install ninja
+
+      - name: Install Meson
+        run: |
+          python -m pip install meson
+
+      - name: Install Bitwuzla
+        run: |
+          git clone https://github.com/bitwuzla/bitwuzla.git
+          cd bitwuzla
+          git checkout -b 0.1.0 0.1.0
+          python ./configure.py --shared --prefix $(pwd)/install
+          cd build
+          sudo ninja install
+
+      - name: Download Z3
+        run: |
+          wget -q https://github.com/Z3Prover/z3/releases/download/z3-4.8.17/z3-4.8.17-x64-osx-10.16.zip
+          unzip z3-4.8.17-x64-osx-10.16.zip
+
+      - name: Install Capstone
+        run: |
+          wget -q https://github.com/aquynh/capstone/archive/4.0.2.tar.gz
+          tar -xf ./4.0.2.tar.gz
+          cd capstone-4.0.2
+          bash ./make.sh
+          sudo make install
+
+      - name: Build Triton Python package
+        run: python -m build --wheel --outdir wheelhouse/default_x86_64
+        env:
+          Z3_INTERFACE: On
+          Z3_INCLUDE_DIRS: ${{ github.workspace }}/z3-4.8.17-x64-osx-10.16/include
+          Z3_LIBRARIES: ${{ github.workspace }}/z3-4.8.17-x64-osx-10.16/bin/libz3.a
+          BITWUZLA_INTERFACE: On
+          BITWUZLA_INCLUDE_DIRS: ${{ github.workspace }}/bitwuzla/install/include
+          BITWUZLA_LIBRARIES: ${{ github.workspace }}/bitwuzla/install/lib/libbitwuzla.dylib
+          CAPSTONE_INCLUDE_DIRS: /usr/local/include
+          CAPSTONE_LIBRARIES: /usr/local/lib/libcapstone.a
+          LLVM_INTERFACE: On
+          CMAKE_PREFIX_PATH: ${{env.LLVM_PATH}}
+          BOOST_INTERFACE: Off
+
+      - name: Repair wheel package
+        run: |
+          pip install delocate
+
+          python ${{ github.workspace }}/src/scripts/macos/delocate-wheel-custom.py \
+            --verbose \
+            --wheel-dir wheelhouse/repaired_x86_64 \
+            ${{ github.workspace }}/wheelhouse/default_x86_64/triton_library-${{ env.package-version }}-${{ matrix.pycp }}-macosx_12_0_x86_64.whl
+
+      - name: Test wheel package
+        run: |
+          pip install virtualenv
+
+          virtualenv test-venv
+          source test-venv/bin/activate
+
+          pip install ${{ github.workspace }}/wheelhouse/repaired_x86_64/triton_library-${{ env.package-version }}-${{ matrix.pycp }}-macosx_12_0_x86_64.whl
+
+          python -c "import triton"
+
+          pip install capstone
+          pip install lief
+          pip install unicorn==2.0.0
+          pip install z3-solver
+
+          cd ${{ github.workspace }}/src/testers
+          python -m unittest discover -b -v unittests
+          deactivate
+
+      - name: Upload wheel package
+        uses: actions/upload-artifact@v3
+        with:
+          name: triton_library-${{ env.package-version }}-${{ matrix.pycp }}-macosx_12_0_x86_64.whl
+          path: ${{ github.workspace }}/wheelhouse/repaired_x86_64/triton_library-${{ env.package-version }}-${{ matrix.pycp }}-macosx_12_0_x86_64.whl
+          if-no-files-found: warn
diff --git a/.gitignore b/.gitignore
@@ -21,3 +21,4 @@ private/*
 .vscode
 dist/
 *.egg-info/
+wheelhouse/
diff --git a/src/scripts/docker/Dockerfile b/src/scripts/docker/Dockerfile
@@ -12,3 +12,50 @@ RUN yum install -y \
         wget
 
 RUN python3.10 -m pip install meson
+
+ENV DEPENDENCIES_DIR=/tmp/triton-dependencies
+ENV SOURCE_DIR=/src
+
+# Create directory for dependencies.
+RUN mkdir -p $DEPENDENCIES_DIR
+
+# Download, build and install GMP.
+RUN echo "[+] Download, build and install GMP" && \
+    cd $DEPENDENCIES_DIR  && \
+    wget -q https://ftp.gnu.org/gnu/gmp/gmp-6.2.1.tar.xz && \
+    tar -xf gmp-6.2.1.tar.xz && \
+    cd gmp-6.2.1 && \
+    ./configure --enable-cxx && \
+    make && \
+    make install
+
+# Download, build and install Bitwuzla.
+RUN echo "[+] Download, build and install Bitwuzla" && \
+    cd $DEPENDENCIES_DIR && \
+    git clone https://github.com/bitwuzla/bitwuzla.git && \
+    cd bitwuzla && \
+    git checkout -b 0.1.0 0.1.0 && \
+    CC=clang CXX=clang++ PATH=$PATH:/opt/_internal/cpython-3.10.12/bin python3.10 ./configure.py --shared --prefix $(pwd)/install && \
+    cd build && \
+    PATH=$PATH:/opt/_internal/cpython-3.10.12/bin ninja install
+
+# Download Z3.
+RUN echo "[+] Download Z3" && \
+cd $DEPENDENCIES_DIR && \
+wget -q https://github.com/Z3Prover/z3/releases/download/z3-4.8.17/z3-4.8.17-x64-glibc-2.31.zip && \
+unzip z3-4.8.17-x64-glibc-2.31.zip
+
+# Download, build and install Capstone.
+RUN echo "[+] Download, build and install Capstone" && \
+    cd $DEPENDENCIES_DIR && \
+    wget -q https://github.com/aquynh/capstone/archive/4.0.2.tar.gz -O capstone-4.0.2.tar.gz && \
+    tar -xf capstone-4.0.2.tar.gz && \
+    cd capstone-4.0.2 && \
+    bash ./make.sh && \
+    sudo make install
+
+# Download LLVM.
+RUN echo "[+] Download LLVM" && \
+    cd $DEPENDENCIES_DIR && \
+    wget -q https://github.com/llvm/llvm-project/releases/download/llvmorg-12.0.1/clang+llvm-12.0.1-x86_64-linux-gnu-ubuntu-16.04.tar.xz && \
+    tar -xf clang+llvm-12.0.1-x86_64-linux-gnu-ubuntu-16.04.tar.xz
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,3 +21,4 @@ private/* @@
     .vscode
     dist/
     *.egg-info/
+    wheelhouse/