Skip to content

Commit e9694af

Browse files
ahueckahueck
committed
CI fixes
1 parent a468a11 commit e9694af

17 files changed

+57
-47
lines changed

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

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

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

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

2020
- name: Format source code
2121
run: |
@@ -24,7 +24,7 @@ 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-14 -i
27+
| xargs -0 clang-format-18 -i
2828
2929
- name: Format check
3030
run: |
@@ -35,7 +35,7 @@ jobs:
3535
runs-on: ubuntu-22.04
3636

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

4141
lit-suite:
@@ -73,7 +73,7 @@ jobs:
7373
runs-on: ${{ matrix.os }}
7474

7575
steps:
76-
- uses: actions/checkout@v4
76+
- uses: actions/checkout@v5
7777

7878
- name: LLVM apt
7979
if: ${{ matrix.llvm-version == 19 }}

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ jobs:
3131
runs-on: ${{ matrix.os }}
3232

3333
steps:
34-
- uses: actions/checkout@v4
34+
- uses: actions/checkout@v5
3535

3636
- name: Checkout test-bench
37-
uses: actions/checkout@v4
37+
uses: actions/checkout@v5
3838
with:
3939
repository: tudasc/typeart-bench
4040
ssh-key: ${{ secrets.AUTH_SSH_CI_EXT }}
@@ -129,10 +129,10 @@ jobs:
129129
runs-on: ${{ matrix.os }}
130130

131131
steps:
132-
- uses: actions/checkout@v4
132+
- uses: actions/checkout@v5
133133

134134
- name: Checkout AD test-bench
135-
uses: actions/checkout@v4
135+
uses: actions/checkout@v5
136136
with:
137137
repository: ahueck/typeart-ad-benchmarks
138138
ssh-key: ${{ secrets.AUTH_SSH_CI_EXT_AD }}
@@ -215,10 +215,10 @@ jobs:
215215
runs-on: ${{ matrix.os }}
216216

217217
steps:
218-
- uses: actions/checkout@v4
218+
- uses: actions/checkout@v5
219219

220220
- name: Checkout OMP test-bench
221-
uses: actions/checkout@v4
221+
uses: actions/checkout@v5
222222
with:
223223
repository: tudasc/typeart-bench
224224
ssh-key: ${{ secrets.AUTH_SSH_CI_EXT }}

‎lib/passes/instrumentation/TypeARTFunctions.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
#include <memory>
3636
#include <optional>
3737
#include <string>
38+
#include <unordered_map>
3839
#include <utility>
3940

4041
namespace typeart {

‎lib/passes/instrumentation/TypeIDProvider.cpp‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,11 +200,19 @@ struct TypeHelper {
200200
if (as_array) {
201201
return ir_build_.getInt16Ty();
202202
}
203+
#if LLVM_VERSION_MAJOR < 15
204+
return ir_build_.getInt8PtrTy();
205+
#else
203206
return ir_build_.getPtrTy();
207+
#endif
204208
}
205209
case IGlobalType::name:
206210
case IGlobalType::ptr:
211+
#if LLVM_VERSION_MAJOR < 15
212+
return ir_build_.getInt8PtrTy();
213+
#else
207214
return ir_build_.getPtrTy();
215+
#endif
208216
}
209217
llvm_unreachable("Should not be reached disk");
210218
}
@@ -241,7 +249,6 @@ struct GlobalTypeRegistrar {
241249
TypeHelper types_helper;
242250
const bool builtin_emit_name{false};
243251

244-
private:
245252
void declare_layout() {
246253
auto& context = module_->getContext();
247254
struct_layout_type_ = llvm::StructType::create(context, "struct._typeart_struct_layout_t");
@@ -483,7 +490,7 @@ std::unique_ptr<TypeRegistry> get_type_id_handler(llvm::Module& m, const TypeDat
483490
TypeSerializationImplementation impl = configuration[config::ConfigStdArgs::type_serialization];
484491
#if LLVM_VERSION_MAJOR < 15
485492
if (impl != typeart::TypeSerializationImplementation::FILE) {
486-
LOG_WARNING("Warning unsupported type serialization mode.")
493+
LOG_WARNING("Unsupported type serialization mode for LLVM-" << LLVM_VERSION_MAJOR)
487494
}
488495
// using llvm-14 would require opaque pointer mode for globals
489496
return std::make_unique<TypeRegistryNoOp>();

‎lib/runtime/GlobalTypeDefCallbacks.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,10 +98,10 @@ GlobalTypeTranslator::GlobalTypeTranslator(TypeDatabase& db) : pImpl(std::make_u
9898
GlobalTypeTranslator::~GlobalTypeTranslator() = default;
9999

100100
void GlobalTypeTranslator::register_type(const void* type) {
101-
const auto* info_struct = reinterpret_cast<const GlobalTypeInfo*>(type);
102-
const auto type_id = pImpl->register_t(info_struct);
101+
const auto* info_struct = reinterpret_cast<const GlobalTypeInfo*>(type);
102+
const auto type_id = pImpl->register_t(info_struct);
103+
LOG_DEBUG("Type id reset: " << info_struct->name << " " << info_struct->type_id << " vs. " << type_id)
103104
const_cast<GlobalTypeInfo*>(info_struct)->type_id = type_id;
104-
// LOG_DEBUG("After: " << info_struct->name << " " << info_struct->type_id)
105105
}
106106

107107
} // namespace typeart

‎lib/runtime/RuntimeData.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
#endif
5151

5252
#include <cstddef> // size_t
53+
#include <cstdint>
5354
#include <vector>
5455

5556
namespace typeart {

‎test/pass/filter/08_amg_box_algebra_mock.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ int hypre_MinUnionBoxes(hypre_BoxArray* boxes) {
150150
break;
151151

152152
} /*switch(i) */
153-
} /* for (i= 0; i< 5; i++) */
153+
} /* for (i= 0; i< 5; i++) */
154154
hypre_TFree(rotated_box);
155155

156156
hypre_UnionBoxes(boxes);
@@ -233,7 +233,7 @@ int hypre_MinUnionBoxes(hypre_BoxArray* boxes) {
233233
break;
234234

235235
} /* switch(array) */
236-
} /* if (array != 5) */
236+
} /* if (array != 5) */
237237

238238
hypre_BoxArrayArrayDestroy(rotated_array);
239239

‎test/pass/filter/09_milc_gauge_stuff_mock.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,9 +127,9 @@ void make_loop_table() {
127127
loop_num[iloop] = count;
128128

129129
} /* end reflection*/
130-
} /* end permutation if block */
131-
} /* end permutation */
132-
} /* end iloop */
130+
} /* end permutation if block */
131+
} /* end permutation */
132+
} /* end iloop */
133133

134134
/* print out the loop coefficients */
135135
printf("loop coefficients: nloop rep loop_coeff multiplicity\n");

‎test/pass/inline_types/01_simple_malloc_int.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ void test() {
1717
// CHECK-NEXT: Free{{[ ]*}}:{{[ ]*}}0
1818
// CHECK-NEXT: Alloca{{[ ]*}}:{{[ ]*}}0
1919

20-
// CHECK: %struct._typeart_struct_layout_t = type { i32, ptr, i64, i64, ptr, ptr, ptr, i32 }
20+
// CHECK: %struct._typeart_struct_layout_t = type { i32, i32, i16, i16, ptr, ptr, ptr, ptr }
2121
// CHECK: [[POINTER:%[0-9a-z]+]] = call noalias{{( align [0-9]+)?}} ptr @malloc
2222
// CHECK-NEXT: call void @__typeart_alloc_mty(ptr [[POINTER]], ptr {{.*}}, i64 42)
2323

24-
// HYBRID-NOT: %struct._typeart_struct_layout_t = type { i32, ptr, i64, i64, ptr, ptr, ptr, i32 }
24+
// HYBRID-NOT: %struct._typeart_struct_layout_t = type {
2525
// HYBRID: [[POINTER:%[0-9a-z]+]] = call noalias{{( align [0-9]+)?}} ptr @malloc
2626
// HYBRID-NEXT: call void @__typeart_alloc(ptr [[POINTER]], i32 13, i64 42)
2727

28-
// FILE-NOT: %struct._typeart_struct_layout_t = type { i32, ptr, i64, i64, ptr, ptr, ptr, i32 }
28+
// FILE-NOT: %struct._typeart_struct_layout_t = type {
2929
// FILE: [[POINTER:%[0-9a-z]+]] = call noalias{{( align [0-9]+)?}} ptr @malloc
3030
// FILE-NEXT: call void @__typeart_alloc(ptr [[POINTER]], i32 13, i64 42)

‎test/pass/inline_types/04_fwd_decl.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// RUN: %cpp-to-llvm %s | %apply-typeart -typeart-type-serialization=inline -S | %filecheck %s
22

3-
// CHECK: @_typeart__ZTS6Domain_fwd = weak_odr constant %struct._typeart_struct_layout_t { i32 256,
3+
// CHECK: @_typeart__ZTS6Domain_fwd = weak_odr global %struct._typeart_struct_layout_t { i32 256,
44

55
// REQUIRES: llvm-18 || llvm-19
66

0 commit comments

Comments
 (0)