Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into i6751-trace_entry_t-pp
Browse files Browse the repository at this point in the history
  • Loading branch information
edeiana committed Oct 22, 2024
2 parents c940f18 + a8ee909 commit 5390027
Show file tree
Hide file tree
Showing 335 changed files with 31,110 additions and 9,802 deletions.
19 changes: 18 additions & 1 deletion .github/workflows/ci-aarchxx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,17 @@ jobs:
fail-fast: false
matrix:
# This job will run in parallel.
os: [ubuntu-20-arm64, ubuntu-20-arm64-sve]
include:
- os: ubuntu-20-arm64-pre-sve
sve: false
- os: ubuntu-20-arm64-sve
sve: true
sve_length: 256
- os: ubuntu-20-arm64-sve
sve: true
sve_length: 128
runs-on: ${{ matrix.os }}
name: aarch64-${{matrix.sve && 'sve-' || ''}}precommit${{matrix.sve_length && '-' || ''}}${{matrix.sve_length}}
steps:
- name: Check out repository code
uses: actions/checkout@v3
Expand Down Expand Up @@ -81,6 +90,14 @@ jobs:
run: ../suite/runsuite_wrapper.pl travis
env:
CI_BRANCH: ${{ github.ref }}
if: ${{ matrix.sve == false || matrix.sve_length == '' }}

- name: Run Suite with sve vector length ${{ matrix.sve_length }}
working-directory: build
run: ../tools/run_with_vector_length.py ${{ matrix.sve_length }} ../suite/runsuite_wrapper.pl travis
env:
CI_BRANCH: ${{ github.ref }}
if: ${{ matrix.sve == true && matrix.sve_length != ''}}

- name: Send failure mail to dynamorio-devs
if: failure() && github.ref == 'refs/heads/master'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ jobs:
# We only use a non-zero build # when making multiple manual builds in one day.
run: |
if test -z "${{ github.event.inputs.version }}"; then
export VERSION_NUMBER=10.0.$((`git log -n 1 --format=%ct` / (60*60*24)))
export VERSION_NUMBER=10.93.$((`git log -n 1 --format=%ct` / (60*60*24)))
else
export VERSION_NUMBER=${{ github.event.inputs.version }}
fi
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-osx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ defaults:
jobs:
# 64-bit OSX build with clang and run tests:
osx-x86-64:
runs-on: macos-11
runs-on: macos-12

steps:
- uses: actions/checkout@v2
Expand Down
50 changes: 30 additions & 20 deletions .github/workflows/ci-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ jobs:
# Use a newer cmake to avoid 32-bit toolchain problems (i#4830).
- name: Setup newer cmake
uses: jwlawson/actions-setup-cmake@v1.8
uses: jwlawson/actions-setup-cmake@v2
with:
cmake-version: '3.19.7'

Expand All @@ -103,7 +103,7 @@ jobs:
# We only use a non-zero build # when making multiple manual builds in one day.
run: |
if test -z "${{ github.event.inputs.version }}"; then
export VERSION_NUMBER=10.0.$((`git log -n 1 --format=%ct` / (60*60*24)))
export VERSION_NUMBER=10.93.$((`git log -n 1 --format=%ct` / (60*60*24)))
else
export VERSION_NUMBER=${{ github.event.inputs.version }}
fi
Expand All @@ -127,7 +127,8 @@ jobs:
CI_BRANCH: ${{ github.ref }}

- name: Upload Artifacts
uses: actions/upload-artifact@v2
# This points to the latest upload-artifact v4.x.x.
uses: actions/upload-artifact@v4
with:
name: linux-tarball
path: DynamoRIO-Linux-${{ steps.version.outputs.version_number }}.tar.gz
Expand Down Expand Up @@ -195,7 +196,7 @@ jobs:
# XXX: See x86 job comments on sharing the default ver# with CMakeLists.txt.
run: |
if test -z "${{ github.event.inputs.version }}"; then
export VERSION_NUMBER=10.0.$((`git log -n 1 --format=%ct` / (60*60*24)))
export VERSION_NUMBER=10.93.$((`git log -n 1 --format=%ct` / (60*60*24)))
else
export VERSION_NUMBER=${{ github.event.inputs.version }}
fi
Expand All @@ -215,7 +216,8 @@ jobs:
CI_BRANCH: ${{ github.ref }}

- name: Upload AArch64
uses: actions/upload-artifact@v2
# This points to the latest upload-artifact v4.x.x.
uses: actions/upload-artifact@v4
with:
name: aarch64-tarball
path: DynamoRIO-AArch64-Linux-${{ steps.version.outputs.version_number }}.tar.gz
Expand Down Expand Up @@ -283,7 +285,7 @@ jobs:
# XXX: See x86 job comments on sharing the default ver# with CMakeLists.txt.
run: |
if test -z "${{ github.event.inputs.version }}"; then
export VERSION_NUMBER=10.0.$((`git log -n 1 --format=%ct` / (60*60*24)))
export VERSION_NUMBER=10.93.$((`git log -n 1 --format=%ct` / (60*60*24)))
else
export VERSION_NUMBER=${{ github.event.inputs.version }}
fi
Expand All @@ -303,7 +305,8 @@ jobs:
CI_BRANCH: ${{ github.ref }}

- name: Upload ARM
uses: actions/upload-artifact@v2
# This points to the latest upload-artifact v4.x.x.
uses: actions/upload-artifact@v4
with:
name: arm-tarball
path: DynamoRIO-ARM-Linux-EABIHF-${{ steps.version.outputs.version_number }}.tar.gz
Expand Down Expand Up @@ -371,7 +374,7 @@ jobs:
# XXX: See x86 job comments on sharing the default ver# with CMakeLists.txt.
run: |
if test -z "${{ github.event.inputs.version }}"; then
export VERSION_NUMBER=10.0.$((`git log -n 1 --format=%ct` / (60*60*24)))
export VERSION_NUMBER=10.93.$((`git log -n 1 --format=%ct` / (60*60*24)))
else
export VERSION_NUMBER=${{ github.event.inputs.version }}
fi
Expand All @@ -393,7 +396,8 @@ jobs:
CI_BRANCH: ${{ github.ref }}

- name: Upload Artifacts
uses: actions/upload-artifact@v2
# This points to the latest upload-artifact v4.x.x.
uses: actions/upload-artifact@v4
with:
name: android-tarball
path: DynamoRIO-ARM-Android-EABI-${{ steps.version.outputs.version_number }}.tar.gz
Expand Down Expand Up @@ -439,19 +443,21 @@ jobs:
git clone --depth=2 https://github.com/DynamoRIO/drmemory.git drmemory
cd drmemory && git submodule update --init --recursive --depth 250 && cd ..
# Install Doxygen.
- uses: ssciwr/doxygen-install@v1

- name: Download Packages
shell: powershell
run: |
md c:\projects\install
(New-Object System.Net.WebClient).DownloadFile("https://github.com/ninja-build/ninja/releases/download/v1.10.2/ninja-win.zip", "c:\projects\install\ninja.zip")
(New-Object System.Net.WebClient).DownloadFile("https://sourceforge.net/projects/doxygen/files/rel-1.8.19/doxygen-1.8.19.windows.x64.bin.zip", "c:\projects\install\doxygen.zip")
- name: Get Version
id: version
# XXX: See x86 job comments on sharing the default ver# with CMakeLists.txt.
run: |
if test -z "${{ github.event.inputs.version }}"; then
export VERSION_NUMBER=10.0.$((`git log -n 1 --format=%ct` / (60*60*24)))
export VERSION_NUMBER=10.93.$((`git log -n 1 --format=%ct` / (60*60*24)))
else
export VERSION_NUMBER=${{ github.event.inputs.version }}
fi
Expand All @@ -468,8 +474,6 @@ jobs:
echo ------ Setting up paths ------
7z x c:\projects\install\ninja.zip -oc:\projects\install\ninja > nul
set PATH=c:\projects\install\ninja;%PATH%
7z x c:\projects\install\doxygen.zip -oc:\projects\install\doxygen > nul
set PATH=c:\projects\install\doxygen;%PATH%
dir "c:\Program Files (x86)\WiX Toolset"*
set PATH=C:\Program Files (x86)\WiX Toolset v3.14\bin;%PATH%
call "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Auxiliary/Build/vcvars32.bat"
Expand All @@ -484,7 +488,8 @@ jobs:
CI_BRANCH: ${{ github.ref }}

- name: Upload Artifacts
uses: actions/upload-artifact@v2
# This points to the latest upload-artifact v4.x.x.
uses: actions/upload-artifact@v4
with:
name: windows-zip
path: DynamoRIO-Windows-${{ steps.version.outputs.version_number }}.zip
Expand Down Expand Up @@ -536,7 +541,7 @@ jobs:
# XXX: See x86 job comments on sharing the default ver# with CMakeLists.txt.
run: |
if test -z "${{ github.event.inputs.version }}"; then
export VERSION_NUMBER="10.0.$((`git log -n 1 --format=%ct` / (60*60*24)))"
export VERSION_NUMBER="10.93.$((`git log -n 1 --format=%ct` / (60*60*24)))"
export PREFIX="cronbuild-"
else
export VERSION_NUMBER=${{ github.event.inputs.version }}
Expand All @@ -562,7 +567,8 @@ jobs:
prerelease: false

- name: Download Linux
uses: actions/download-artifact@v2
# This points to the latest download-artifact v4.x.x.
uses: actions/download-artifact@v4
with:
name: linux-tarball
- name: Upload Linux
Expand All @@ -577,7 +583,8 @@ jobs:
asset_content_type: application/x-gzip

- name: Download AArch64
uses: actions/download-artifact@v2
# This points to the latest download-artifact v4.x.x.
uses: actions/download-artifact@v4
with:
name: aarch64-tarball
- name: Upload AArch64
Expand All @@ -592,7 +599,8 @@ jobs:
asset_content_type: application/x-gzip

- name: Download ARM
uses: actions/download-artifact@v2
# This points to the latest download-artifact v4.x.x.
uses: actions/download-artifact@v4
with:
name: arm-tarball
- name: Upload ARM
Expand All @@ -607,7 +615,8 @@ jobs:
asset_content_type: application/x-gzip

- name: Download Android
uses: actions/download-artifact@v2
# This points to the latest download-artifact v4.x.x.
uses: actions/download-artifact@v4
with:
name: android-tarball
- name: Upload Android
Expand All @@ -622,7 +631,8 @@ jobs:
asset_content_type: application/x-gzip

- name: Download Windows
uses: actions/download-artifact@v2
# This points to the latest download-artifact v4.x.x.
uses: actions/download-artifact@v4
with:
name: windows-zip
- name: Upload Windows
Expand Down
13 changes: 8 additions & 5 deletions .github/workflows/ci-riscv64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,10 @@ defaults:

jobs:
# RISCV64 cross-compile with gcc
# We use ubuntu 22.04 because the compilition here need python (3.10.x)
# We use ubuntu 24.04 because the compilition here need libunwind-riscv64 and
# it's a stable source.
riscv64-cross-compile:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04

steps:
- uses: actions/checkout@v2
Expand All @@ -70,14 +71,16 @@ jobs:
# Install cross-compiler for cross-compiling Linux build.
# Unfortunately there are no libunwind or compression cross-compile
# packages so we unpack the native versions and copy their files.
# Unfortunately, only kinetic (ubuntu 22.10) has linunwind-riscv64 packages.
# I prefer debian-ports here, it is more close to upstream.
- name: Create Build Environment
run: |
sudo apt-get update
sudo apt-get -y install doxygen vera++ cmake crossbuild-essential-riscv64 git \
qemu-user qemu-user-binfmt
sudo add-apt-repository 'deb [trusted=yes arch=riscv64] http://deb.debian.org/debian sid main'
# We cannot use the following command here, because it will download the
# x86_64 binaries due to some known issue of DEB822.
# sudo add-apt-repository 'deb [arch=riscv64] http://ports.ubuntu.com/ubuntu-ports noble main'
echo 'deb [arch=riscv64] http://ports.ubuntu.com/ubuntu-ports noble main' | sudo tee -a /etc/apt/sources.list
sudo apt-get update
apt download libunwind8:riscv64 libunwind-dev:riscv64 liblzma5:riscv64 \
zlib1g:riscv64 zlib1g-dev:riscv64 libsnappy1v5:riscv64 libsnappy-dev:riscv64 \
liblz4-1:riscv64 liblz4-dev:riscv64
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/ci-windows.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# **********************************************************
# Copyright (c) 2020-2023 Google, Inc. All rights reserved.
# Copyright (c) 2020-2024 Google, Inc. All rights reserved.
# **********************************************************

# Redistribution and use in source and binary forms, with or without
Expand Down Expand Up @@ -70,21 +70,21 @@ jobs:
- name: Fetch Sources
run: git fetch --no-tags --depth=1 origin master

# Install Doxygen.
- uses: ssciwr/doxygen-install@v1

- name: Download Packages
shell: powershell
run: |
md c:\projects\install
(New-Object System.Net.WebClient).DownloadFile("https://github.com/ninja-build/ninja/releases/download/v1.10.2/ninja-win.zip", "c:\projects\install\ninja.zip")
(New-Object System.Net.WebClient).DownloadFile("https://sourceforge.net/projects/doxygen/files/rel-1.8.19/doxygen-1.8.19.windows.x64.bin.zip", "c:\projects\install\doxygen.zip")
- name: Run Suite
working-directory: ${{ github.workspace }}
run: |
echo ------ Setting up paths ------
7z x c:\projects\install\ninja.zip -oc:\projects\install\ninja > nul
set PATH=c:\projects\install\ninja;%PATH%
7z x c:\projects\install\doxygen.zip -oc:\projects\install\doxygen > nul
set PATH=c:\projects\install\doxygen;%PATH%
call "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Auxiliary/Build/vcvars32.bat"
echo ------ Running suite ------
echo PATH is "%PATH%"
Expand Down Expand Up @@ -137,21 +137,21 @@ jobs:
- name: Fetch Sources
run: git fetch --no-tags --depth=1 origin master

# Install Doxygen.
- uses: ssciwr/doxygen-install@v1

- name: Download Packages
shell: powershell
run: |
md c:\projects\install
(New-Object System.Net.WebClient).DownloadFile("https://github.com/ninja-build/ninja/releases/download/v1.10.2/ninja-win.zip", "c:\projects\install\ninja.zip")
(New-Object System.Net.WebClient).DownloadFile("https://sourceforge.net/projects/doxygen/files/rel-1.8.19/doxygen-1.8.19.windows.x64.bin.zip", "c:\projects\install\doxygen.zip")
- name: Run Suite
working-directory: ${{ github.workspace }}
run: |
echo ------ Setting up paths ------
7z x c:\projects\install\ninja.zip -oc:\projects\install\ninja > nul
set PATH=c:\projects\install\ninja;%PATH%
7z x c:\projects\install\doxygen.zip -oc:\projects\install\doxygen > nul
set PATH=c:\projects\install\doxygen;%PATH%
call "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Auxiliary/Build/vcvars32.bat"
echo ------ Running suite ------
echo PATH is "%PATH%"
Expand Down Expand Up @@ -204,21 +204,21 @@ jobs:
- name: Fetch Sources
run: git fetch --no-tags --depth=1 origin master

# Install Doxygen.
- uses: ssciwr/doxygen-install@v1

- name: Download Packages
shell: powershell
run: |
md c:\projects\install
(New-Object System.Net.WebClient).DownloadFile("https://github.com/ninja-build/ninja/releases/download/v1.10.2/ninja-win.zip", "c:\projects\install\ninja.zip")
(New-Object System.Net.WebClient).DownloadFile("https://sourceforge.net/projects/doxygen/files/rel-1.8.19/doxygen-1.8.19.windows.x64.bin.zip", "c:\projects\install\doxygen.zip")
- name: Run Suite
working-directory: ${{ github.workspace }}
run: |
echo ------ Setting up paths ------
7z x c:\projects\install\ninja.zip -oc:\projects\install\ninja > nul
set PATH=c:\projects\install\ninja;%PATH%
7z x c:\projects\install\doxygen.zip -oc:\projects\install\doxygen > nul
set PATH=c:\projects\install\doxygen;%PATH%
call "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Auxiliary/Build/vcvars32.bat"
echo ------ Running suite ------
echo PATH is "%PATH%"
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/ci-x86.yml
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ jobs:
# Use a newer cmake to avoid 32-bit toolchain problems (i#4830).
- name: Setup newer cmake
uses: jwlawson/actions-setup-cmake@v1.8
uses: jwlawson/actions-setup-cmake@v2
with:
cmake-version: '3.19.7'

Expand Down Expand Up @@ -162,7 +162,7 @@ jobs:
# Use a newer cmake to avoid 32-bit toolchain problems (i#4830).
- name: Setup newer cmake
uses: jwlawson/actions-setup-cmake@v1.8
uses: jwlawson/actions-setup-cmake@v2
with:
cmake-version: '3.19.7'

Expand Down Expand Up @@ -226,7 +226,7 @@ jobs:
# Use a newer cmake to avoid 32-bit toolchain problems (i#4830).
- name: Setup newer cmake
uses: jwlawson/actions-setup-cmake@v1.8
uses: jwlawson/actions-setup-cmake@v2
with:
cmake-version: '3.19.7'

Expand Down Expand Up @@ -298,7 +298,7 @@ jobs:
# Use a newer cmake to avoid 32-bit toolchain problems (i#4830).
- name: Setup newer cmake
uses: jwlawson/actions-setup-cmake@v1.8
uses: jwlawson/actions-setup-cmake@v2
with:
cmake-version: '3.19.7'

Expand Down
Loading

0 comments on commit 5390027

Please sign in to comment.