Skip to content

Expand build compatibility on GCC and Clang for Ubuntu 22.04 #2275

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Apr 8, 2023
Merged

Expand build compatibility on GCC and Clang for Ubuntu 22.04 #2275

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
56d7539
[code] format
tangxifan Apr 6, 2023
0e9c33e
[ci] now expand build compatibility to gcc-12, clang-11, clang-12, cl…
tangxifan Apr 6, 2023
37b40e5
Merge branch 'master' into xt_ci_build_compatibility
vaughnbetz Apr 6, 2023
80acb93
Merge branch 'master' of github.com:verilog-to-routing/vtr-verilog-to…
tangxifan Apr 7, 2023
0e5cec0
[core] fixed a syntax to be compatibile with gcc-12 and clang-11+
tangxifan Apr 7, 2023
d32240d
Merge branch 'xt_ci_build_compatibility' of github.com:verilog-to-rou…
tangxifan Apr 7, 2023
8e9a566
Merge branch 'xt_format' of github.com:verilog-to-routing/vtr-verilog…
tangxifan Apr 7, 2023
e5bf4a5
Merge branch 'master' into xt_ci_build_compatibility
tangxifan Apr 7, 2023
c7d2dad
[ci] fixed the bug where clang-11 is not found on CI machine
tangxifan Apr 7, 2023
a5bf609
[ci] remove redundant dependency list
tangxifan Apr 7, 2023
309ad13
Merge branch 'master' into xt_ci_build_compatibility
tangxifan Apr 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions .github/scripts/install_dependencies.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,15 +43,19 @@ sudo apt install -y \
qtbase5-dev \
uuid-dev \
default-jdk \
clang \
clang-format-12 \
g++-9 \
gcc-9 \
g++-10 \
gcc-10 \
g++-11 \
gcc-11 \
g++-12 \
gcc-12 \
clang-11 \
clang-12 \
clang-13 \
clang-14 \
clang-format-14 \
libtbb12

pip install -r requirements.txt
Expand Down
59 changes: 0 additions & 59 deletions .github/workflows/build_dependency_ubuntu-22.04.sh
View file
Open in desktop

This file was deleted.

4 changes: 4 additions & 0 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,11 @@ jobs:
- { name: 'GCC 9 (Ubuntu Jammy - 22.04)', eval: 'CC=gcc-9 && CXX=g++-9', }
- { name: 'GCC 10 (Ubuntu Jammy - 22.04)', eval: 'CC=gcc-10 && CXX=g++-10', }
- { name: 'GCC 11 (Ubuntu Jammy - 22.04)', eval: 'CC=gcc-11 && CXX=g++-11', }
- { name: 'GCC 12 (Ubuntu Jammy - 22.04)', eval: 'CC=gcc-12 && CXX=g++-12', }
- { name: 'Clang 11 (Ubuntu Jammy - 22.04)', eval: 'CC=clang-11 && CXX=clang++-11', }
- { name: 'Clang 12 (Ubuntu Jammy - 22.04)', eval: 'CC=clang-12 && CXX=clang++-12', }
- { name: 'Clang 13 (Ubuntu Jammy - 22.04)', eval: 'CC=clang-13 && CXX=clang++-13', }
- { name: 'Clang 14 (Ubuntu Jammy - 22.04)', eval: 'CC=clang-14 && CXX=clang++-14', }
name: 'B: ${{ matrix.name }}'
steps:

Expand Down
2 changes: 1 addition & 1 deletion libs/librrgraph/src/base/rr_graph_storage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ struct edge_swapper {
std::swap(a.storage_->edge_src_node_[a_edge], a.storage_->edge_src_node_[b_edge]);
std::swap(a.storage_->edge_dest_node_[a_edge], a.storage_->edge_dest_node_[b_edge]);
std::swap(a.storage_->edge_switch_[a_edge], a.storage_->edge_switch_[b_edge]);
std::swap(a.storage_->edge_remapped_[a_edge], a.storage_->edge_remapped_[b_edge]);
std::vector<bool>::swap(a.storage_->edge_remapped_[a_edge], a.storage_->edge_remapped_[b_edge]);
}

friend void swap(edge_swapper& a, edge_swapper& b) {
Expand Down
12 changes: 6 additions & 6 deletions libs/libvtrutil/src/vtr_geometry.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,10 @@ class Point {
T y() const;

///@brief == operator
friend bool operator==<>(Point<T> lhs, Point<T> rhs);
friend bool operator== <>(Point<T> lhs, Point<T> rhs);

///@brief != operator
friend bool operator!=<>(Point<T> lhs, Point<T> rhs);
friend bool operator!= <>(Point<T> lhs, Point<T> rhs);

///@brief < operator
friend bool operator< <>(Point<T> lhs, Point<T> rhs);
Expand Down Expand Up @@ -172,10 +172,10 @@ class Rect {
bool empty() const;

///@brief == operator
friend bool operator==<>(const Rect<T>& lhs, const Rect<T>& rhs);
friend bool operator== <>(const Rect<T>& lhs, const Rect<T>& rhs);

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

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

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

private:
// Note that a union of rectanges may have holes and may not be contiguous
Expand Down
4 changes: 2 additions & 2 deletions libs/libvtrutil/src/vtr_strong_id.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,9 +202,9 @@ class StrongId {
* Note that since these are templated functions we provide an empty set of template parameters
* after the function name (i.e. <>)
*/
friend bool operator==<>(const StrongId<tag, T, sentinel>& lhs, const StrongId<tag, T, sentinel>& rhs);
friend bool operator== <>(const StrongId<tag, T, sentinel>& lhs, const StrongId<tag, T, sentinel>& rhs);
///@brief != operator
friend bool operator!=<>(const StrongId<tag, T, sentinel>& lhs, const StrongId<tag, T, sentinel>& rhs);
friend bool operator!= <>(const StrongId<tag, T, sentinel>& lhs, const StrongId<tag, T, sentinel>& rhs);
///@brief < operator
friend bool operator< <>(const StrongId<tag, T, sentinel>& lhs, const StrongId<tag, T, sentinel>& rhs);

Expand Down