Skip to content

Commit 84a6883

Browse files
authored
Merge pull request #2275 from verilog-to-routing/xt_ci_build_compatibility
Expand build compatibility on GCC and Clang for Ubuntu 22.04
2 parents 1d6edf9 + 309ad13 commit 84a6883

File tree

6 files changed

+19
-70
lines changed

6 files changed

+19
-70
lines changed

.github/scripts/install_dependencies.sh

+6-2
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,19 @@ sudo apt install -y \
4343
qtbase5-dev \
4444
uuid-dev \
4545
default-jdk \
46-
clang \
47-
clang-format-12 \
4846
g++-9 \
4947
gcc-9 \
5048
g++-10 \
5149
gcc-10 \
5250
g++-11 \
5351
gcc-11 \
52+
g++-12 \
53+
gcc-12 \
54+
clang-11 \
5455
clang-12 \
56+
clang-13 \
57+
clang-14 \
58+
clang-format-14 \
5559
libtbb12
5660

5761
pip install -r requirements.txt

.github/workflows/build_dependency_ubuntu-22.04.sh

-59
This file was deleted.

.github/workflows/test.yml

+4
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,11 @@ jobs:
363363
- { name: 'GCC 9 (Ubuntu Jammy - 22.04)', eval: 'CC=gcc-9 && CXX=g++-9', }
364364
- { name: 'GCC 10 (Ubuntu Jammy - 22.04)', eval: 'CC=gcc-10 && CXX=g++-10', }
365365
- { name: 'GCC 11 (Ubuntu Jammy - 22.04)', eval: 'CC=gcc-11 && CXX=g++-11', }
366+
- { name: 'GCC 12 (Ubuntu Jammy - 22.04)', eval: 'CC=gcc-12 && CXX=g++-12', }
367+
- { name: 'Clang 11 (Ubuntu Jammy - 22.04)', eval: 'CC=clang-11 && CXX=clang++-11', }
366368
- { name: 'Clang 12 (Ubuntu Jammy - 22.04)', eval: 'CC=clang-12 && CXX=clang++-12', }
369+
- { name: 'Clang 13 (Ubuntu Jammy - 22.04)', eval: 'CC=clang-13 && CXX=clang++-13', }
370+
- { name: 'Clang 14 (Ubuntu Jammy - 22.04)', eval: 'CC=clang-14 && CXX=clang++-14', }
367371
name: 'B: ${{ matrix.name }}'
368372
steps:
369373

libs/librrgraph/src/base/rr_graph_storage.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ struct edge_swapper {
120120
std::swap(a.storage_->edge_src_node_[a_edge], a.storage_->edge_src_node_[b_edge]);
121121
std::swap(a.storage_->edge_dest_node_[a_edge], a.storage_->edge_dest_node_[b_edge]);
122122
std::swap(a.storage_->edge_switch_[a_edge], a.storage_->edge_switch_[b_edge]);
123-
std::swap(a.storage_->edge_remapped_[a_edge], a.storage_->edge_remapped_[b_edge]);
123+
std::vector<bool>::swap(a.storage_->edge_remapped_[a_edge], a.storage_->edge_remapped_[b_edge]);
124124
}
125125

126126
friend void swap(edge_swapper& a, edge_swapper& b) {

libs/libvtrutil/src/vtr_geometry.h

+6-6
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,10 @@ class Point {
7171
T y() const;
7272

7373
///@brief == operator
74-
friend bool operator==<>(Point<T> lhs, Point<T> rhs);
74+
friend bool operator== <>(Point<T> lhs, Point<T> rhs);
7575

7676
///@brief != operator
77-
friend bool operator!=<>(Point<T> lhs, Point<T> rhs);
77+
friend bool operator!= <>(Point<T> lhs, Point<T> rhs);
7878

7979
///@brief < operator
8080
friend bool operator< <>(Point<T> lhs, Point<T> rhs);
@@ -172,10 +172,10 @@ class Rect {
172172
bool empty() const;
173173

174174
///@brief == operator
175-
friend bool operator==<>(const Rect<T>& lhs, const Rect<T>& rhs);
175+
friend bool operator== <>(const Rect<T>& lhs, const Rect<T>& rhs);
176176

177177
///@brief != operator
178-
friend bool operator!=<>(const Rect<T>& lhs, const Rect<T>& rhs);
178+
friend bool operator!= <>(const Rect<T>& lhs, const Rect<T>& rhs);
179179

180180
public: //Mutators
181181
///@brief set xmin to a point
@@ -296,10 +296,10 @@ class RectUnion {
296296
*
297297
* Note: does not check whether the representations they are equivalent
298298
*/
299-
friend bool operator==<>(const RectUnion<T>& lhs, const RectUnion<T>& rhs);
299+
friend bool operator== <>(const RectUnion<T>& lhs, const RectUnion<T>& rhs);
300300

301301
///@brief != operator
302-
friend bool operator!=<>(const RectUnion<T>& lhs, const RectUnion<T>& rhs);
302+
friend bool operator!= <>(const RectUnion<T>& lhs, const RectUnion<T>& rhs);
303303

304304
private:
305305
// Note that a union of rectanges may have holes and may not be contiguous

libs/libvtrutil/src/vtr_strong_id.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -202,9 +202,9 @@ class StrongId {
202202
* Note that since these are templated functions we provide an empty set of template parameters
203203
* after the function name (i.e. <>)
204204
*/
205-
friend bool operator==<>(const StrongId<tag, T, sentinel>& lhs, const StrongId<tag, T, sentinel>& rhs);
205+
friend bool operator== <>(const StrongId<tag, T, sentinel>& lhs, const StrongId<tag, T, sentinel>& rhs);
206206
///@brief != operator
207-
friend bool operator!=<>(const StrongId<tag, T, sentinel>& lhs, const StrongId<tag, T, sentinel>& rhs);
207+
friend bool operator!= <>(const StrongId<tag, T, sentinel>& lhs, const StrongId<tag, T, sentinel>& rhs);
208208
///@brief < operator
209209
friend bool operator< <>(const StrongId<tag, T, sentinel>& lhs, const StrongId<tag, T, sentinel>& rhs);
210210

0 commit comments

Comments
 (0)