Skip to content

Commit c734790

Browse files
ahueckahueck
authored
Merge PR #145 from tudasc/devel
2 parents 3b3e9c3 + 81ee6d8 commit c734790

File tree

199 files changed

+3657
-1175
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

199 files changed

+3657
-1175
lines changed

‎.codespellrc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
builtin = clear,rare,en-GB_to_en-US,names,informal,code
33
check-filenames =
44
check-hidden =
5-
skip = */.git,*/build*,*/.codespellrc,*/install,*/lulesh,wrap.py
5+
skip = */.git,*/build*,*/.codespellrc,*/install,*/lulesh,wrap.py,*.llin
66
quiet-level = 2
77
ignore-regex = ^#include <(?:stdio)\.h>$|DEPENDEES|\\endcode
8-
ignore-words-list = uint
8+
ignore-words-list = uint,files'

‎.github/workflows/basic-ci.yml‎

Lines changed: 13 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ env:
1212

1313
jobs:
1414
format-check:
15-
runs-on: ubuntu-20.04
15+
runs-on: ubuntu-22.04
1616

1717
steps:
18-
- uses: actions/checkout@v2
18+
- uses: actions/checkout@v4
1919

2020
- name: Format source code
2121
run: |
@@ -24,27 +24,28 @@ jobs:
2424
-a \( -name "*.c" -o -name "*.cpp" -o -name "*.h" \) \
2525
-not -path "*/lulesh/*" -not -path "*/CallSite.h" \
2626
-print0 \
27-
| xargs -0 clang-format-12 -i
27+
| xargs -0 clang-format-14 -i
2828
2929
- name: Format check
3030
run: |
3131
git status --porcelain --untracked-files=no
3232
git status --porcelain --untracked-files=no | xargs -o -I {} test -z \"{}\"
3333
3434
codespell:
35-
runs-on: ubuntu-20.04
35+
runs-on: ubuntu-22.04
3636

3737
steps:
38-
- uses: actions/checkout@v2
39-
- uses: codespell-project/actions-codespell@master
38+
- uses: actions/checkout@v4
39+
- uses: codespell-project/actions-codespell@v2
4040

4141
lit-suite:
42-
runs-on: ubuntu-20.04
42+
runs-on: ubuntu-22.04
4343

4444
strategy:
4545
fail-fast: false
4646
matrix:
47-
llvm-version: [ 10, 11, 12 ]
47+
llvm-version: [ 14 ]
48+
typeart-typegen-legacy: [ 0, 1 ]
4849
preset:
4950
- name: ci-thread-safe-safeptr
5051
- name: ci-thread-safe
@@ -60,7 +61,7 @@ jobs:
6061
skip_test: true
6162

6263
steps:
63-
- uses: actions/checkout@v2
64+
- uses: actions/checkout@v4
6465

6566
- name: Update apt
6667
run: sudo apt-get update
@@ -91,6 +92,7 @@ jobs:
9192
sudo ln -f -s /usr/bin/clang++-${{ matrix.llvm-version }} /usr/bin/clang++
9293
echo "LLVM_CMAKE_DIR=/usr/lib/llvm-${{ matrix.llvm-version }}/cmake" >> $GITHUB_ENV
9394
echo "EXTERNAL_LIT=/usr/lib/llvm-${{ matrix.llvm-version }}/build/utils/lit/lit.py" >> $GITHUB_ENV
95+
echo "TYPEART_TYPEGEN_IR=${{ matrix.typeart-typegen-legacy }}" >> $GITHUB_ENV
9496
9597
- name: Configure TypeART
9698
run: cmake -B build --preset ${{ matrix.preset.name }} -DLLVM_DIR=${LLVM_CMAKE_DIR} -DLLVM_EXTERNAL_LIT=${EXTERNAL_LIT}
@@ -110,31 +112,18 @@ jobs:
110112
if: matrix.preset.coverage
111113
run: cmake --build build --target typeart-lcov-html
112114

113-
- name: Prepare coverage artifact
114-
if: matrix.preset.coverage
115-
run: |
116-
mkdir -p artifact/${{ matrix.preset.name }}-${{ matrix.llvm-version }}
117-
mv build/profiles/ artifact/${{ matrix.preset.name }}-${{ matrix.llvm-version }}
118-
119-
- name: Upload test coverage artifact
120-
if: matrix.preset.coverage
121-
uses: actions/upload-artifact@v2
122-
with:
123-
name: typeart-ci-coverage
124-
path: artifact
125-
126115
- name: Coveralls (parallel)
127116
if: matrix.preset.coverage
128117
uses: coverallsapp/github-action@master
129118
with:
130119
github-token: ${{ secrets.GITHUB_TOKEN }}
131120
path-to-lcov: build/typeart.coverage
132-
flag-name: ${{ matrix.preset.name }}-${{ matrix.llvm-version }}
121+
flag-name: ${{ matrix.preset.name }}-${{ matrix.llvm-version }}-${{ matrix.typeart-typegen-legacy }}
133122
parallel: true
134123

135124
finish-coverage:
136125
needs: lit-suite
137-
runs-on: ubuntu-20.04
126+
runs-on: ubuntu-22.04
138127
steps:
139128
- name: Coveralls Finished
140129
uses: coverallsapp/github-action@master

‎.github/workflows/ext-ci.yml‎

Lines changed: 31 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,22 @@ env:
1111

1212
jobs:
1313
run-testbench:
14-
runs-on: ubuntu-20.04
14+
runs-on: ubuntu-22.04
1515

1616
strategy:
1717
fail-fast: false
1818
matrix:
19-
llvm-version: [ 10, 12 ]
19+
llvm-version: [ 14 ]
2020
preset:
2121
- name: release-counter
2222
- name: release-safeptr-counter
2323
- name: release-unsafe-counter
2424

2525
steps:
26-
- uses: actions/checkout@v2
26+
- uses: actions/checkout@v4
2727

2828
- name: Checkout test-bench
29-
uses: actions/checkout@v2
29+
uses: actions/checkout@v4
3030
with:
3131
repository: tudasc/typeart-bench
3232
ssh-key: ${{ secrets.AUTH_SSH_CI_EXT }}
@@ -79,34 +79,38 @@ jobs:
7979
working-directory: test-bench/build
8080
run: ctest -V -R amg2013 -O amg2013_${{ matrix.llvm-version }}_build.log
8181

82+
- name: Run tealeaf
83+
working-directory: test-bench/build
84+
run: ctest -V -R tealeaf -O tealeaf_${{ matrix.llvm-version }}_build.log
85+
8286
- name: Prepare artifact
8387
run: |
84-
mkdir -p artifact/bench
85-
mv test-bench/build/*_build.log artifact/bench
86-
mv test-bench/artifact-${{ matrix.llvm-version }} artifact/bench
88+
mkdir -p artifact
89+
mv test-bench/build/*_build.log artifact
90+
mv test-bench/artifact-${{ matrix.llvm-version }}/* artifact
8791
8892
- name: Upload test-bench artifact
89-
uses: actions/upload-artifact@v2
93+
uses: actions/upload-artifact@v4
9094
with:
91-
name: typeart-ci-ext
95+
name: typeart-ci-ext-${{ matrix.llvm-version }}-${{ matrix.preset.name }}
9296
path: artifact
9397

9498
run-AD-testbench:
95-
runs-on: ubuntu-20.04
99+
runs-on: ubuntu-22.04
96100

97101
strategy:
98102
fail-fast: false
99103
matrix:
100-
llvm-version: [ 10, 12 ]
104+
llvm-version: [ 14 ]
101105
preset:
102106
- name: release-counter
103107
- name: release-unsafe-counter
104108

105109
steps:
106-
- uses: actions/checkout@v2
110+
- uses: actions/checkout@v4
107111

108112
- name: Checkout AD test-bench
109-
uses: actions/checkout@v2
113+
uses: actions/checkout@v4
110114
with:
111115
repository: ahueck/typeart-ad-benchmarks
112116
ssh-key: ${{ secrets.AUTH_SSH_CI_EXT_AD }}
@@ -150,35 +154,35 @@ jobs:
150154

151155
- name: Prepare artifact
152156
run: |
153-
mkdir -p artifact/ad-bench
154-
mv ad-test-bench/build/*_build.log artifact/ad-bench
155-
mv ad-test-bench/artifact-${{ matrix.llvm-version }} artifact/ad-bench
157+
mkdir -p artifact
158+
mv ad-test-bench/build/*_build.log artifact
159+
mv ad-test-bench/artifact-${{ matrix.llvm-version }}/* artifact
156160
157161
- name: Upload AD test-bench artifact
158-
uses: actions/upload-artifact@v2
162+
uses: actions/upload-artifact@v4
159163
with:
160-
name: typeart-ci-ext-ad
164+
name: typeart-ci-ext-ad-${{ matrix.llvm-version }}-${{ matrix.preset.name }}
161165
path: artifact
162166

163167
run-OMP-testbench:
164-
runs-on: ubuntu-20.04
168+
runs-on: ubuntu-22.04
165169

166170
env:
167171
OMP_NUM_THREAD: 2
168172

169173
strategy:
170174
fail-fast: false
171175
matrix:
172-
llvm-version: [ 10, 12 ]
176+
llvm-version: [ 14 ]
173177
preset:
174178
- name: release-counter
175179
- name: release-safeptr-counter
176180

177181
steps:
178-
- uses: actions/checkout@v2
182+
- uses: actions/checkout@v4
179183

180184
- name: Checkout OMP test-bench
181-
uses: actions/checkout@v2
185+
uses: actions/checkout@v4
182186
with:
183187
repository: tudasc/typeart-bench
184188
ssh-key: ${{ secrets.AUTH_SSH_CI_EXT }}
@@ -229,12 +233,12 @@ jobs:
229233

230234
- name: Prepare artifact
231235
run: |
232-
mkdir -p artifact/bench
233-
mv omp-test-bench/build/*_build.log artifact/bench
234-
mv omp-test-bench/artifact-${{ matrix.llvm-version }} artifact/bench
236+
mkdir -p artifact
237+
mv omp-test-bench/build/*_build.log artifact
238+
mv omp-test-bench/artifact-${{ matrix.llvm-version }}/* artifact
235239
236240
- name: Upload omp-test-bench artifact
237-
uses: actions/upload-artifact@v2
241+
uses: actions/upload-artifact@v4
238242
with:
239-
name: typeart-ci-ext-omp
243+
name: typeart-ci-ext-omp-${{ matrix.llvm-version }}-${{ matrix.preset.name }}
240244
path: artifact

‎CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cmake_minimum_required(VERSION 3.20)
22

33
project(typeart
4-
VERSION 1.8
4+
VERSION 1.9
55
HOMEPAGE_URL https://github.com/tudasc/TypeART
66
DESCRIPTION "LLVM-based type and memory allocation tracking sanitizer"
77
)
@@ -15,7 +15,7 @@ endif()
1515

1616
if(TYPEART_IS_TOP_LEVEL)
1717
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
18-
set(CMAKE_VERBOSE_MAKEFILE OFF)
18+
set(CMAKE_VERBOSE_MAKEFILE ON)
1919
endif()
2020

2121
set(CMAKE_CXX_STANDARD 17)

‎LICENSE.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
BSD 3-Clause License
22

3-
Copyright (c) 2017-2022, TypeART authors
3+
Copyright (c) 2017-2025, TypeART authors
44
All rights reserved.
55

66
Redistribution and use in source and binary forms, with or without

0 commit comments

Comments
 (0)