Skip to content

Commit aae6bc2

Browse files
1arie11arie1
committed
feat: update to v1.53
1 parent 8da68b1 commit aae6bc2

File tree

6 files changed

+31
-27
lines changed

6 files changed

+31
-27
lines changed

‎.github/workflows/main.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ jobs:
1515
- name: Install dependencies
1616
run: |
1717
brew install just ninja swig
18-
rustup install 1.84.1
19-
rustup toolchain install 1.84.1
20-
rustup default 1.84.1-aarch64-apple-darwin
18+
rustup install 1.89.0
19+
rustup toolchain install 1.89.0
20+
rustup default 1.89.0-aarch64-apple-darwin
2121
- name: Clone
2222
run: just clone
2323
- name: Prepare
@@ -45,9 +45,9 @@ jobs:
4545
- name: Install dependencies
4646
run: |
4747
brew install just ninja swig
48-
rustup install 1.84.1
49-
rustup toolchain install 1.84.1
50-
rustup default 1.84.1-x86_64-apple-darwin
48+
rustup install 1.89.0
49+
rustup toolchain install 1.89.0
50+
rustup default 1.89.0-x86_64-apple-darwin
5151
- name: Clone
5252
run: just clone
5353
- name: Prepare
@@ -78,9 +78,9 @@ jobs:
7878
run: |
7979
sudo apt update; sudo apt install ninja-build
8080
sudo apt-get install build-essential swig python3-dev libedit-dev libncurses5-dev libxml2-dev
81-
rustup install 1.84.1
82-
rustup toolchain install 1.84.1
83-
rustup default 1.84.1-x86_64-unknown-linux-gnu
81+
rustup install 1.89.0
82+
rustup toolchain install 1.89.0
83+
rustup default 1.89.0-x86_64-unknown-linux-gnu
8484
- name: Free Disk Space (Ubuntu)
8585
uses: jlumbroso/free-disk-space@main
8686
with:

‎justfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ build-cargo:
2929
# AG: this fails for me with macport and libiconv
3030
# AG: I have to disable libiconv, run this manually
3131
# AG: and then re-enable it
32-
cd {{ out_dir }}/cargo && env OPENSSL_STATIC=1 cargo +1.84.1 build --release
32+
cd {{ out_dir }}/cargo && env OPENSSL_STATIC=1 cargo +1.89.0 build --release
3333

3434
[linux]
3535
build-cargo:
36-
cd {{ out_dir }}/cargo && env OPENSSL_STATIC=1 OPENSSL_LIB_DIR=/usr/lib/x86_64-linux-gnu OPENSSL_INCLUDE_DIR=/usr/include/openssl cargo +1.84.1 build --release
36+
cd {{ out_dir }}/cargo && env OPENSSL_STATIC=1 OPENSSL_LIB_DIR=/usr/lib/x86_64-linux-gnu OPENSSL_INCLUDE_DIR=/usr/include/openssl cargo +1.89.0 build --release
3737

3838

3939
[linux,macos]
@@ -79,7 +79,7 @@ build-newlib: build-newlib-v0 build-newlib-v1 build-newlib-v2 build-newlib-v3 bu
7979
build-newlib:
8080
@echo "No need to build newlib on Windows"
8181

82-
deploy_dir := env('HOME') / '.cache/solana/v1.51/certora-platform-tools'
82+
deploy_dir := env('HOME') / '.cache/solana/v1.53/certora-platform-tools'
8383
artifact_tar := out_dir / artifact
8484

8585
package:

‎patches/02-llvm-sroa-novector.patch‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
diff --git a/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp b/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
2-
index 5038f8a1f..fe9d45a82 100644
2+
index e921ced83..d79182061 100644
33
--- a/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
44
+++ b/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
5-
@@ -146,6 +146,12 @@ static cl::opt<bool> EnableVectorFCopySignExtendRound(
5+
@@ -153,6 +153,13 @@ static cl::opt<bool> EnableVectorFCopySignExtendRound(
6+
"combiner-vector-fcopysign-extend-round", cl::Hidden, cl::init(false),
67
cl::desc(
78
"Enable merging extends and rounds into FCOPYSIGN on vector types"));
8-
9+
+
910
+static cl::opt<bool> EnableLoadCombine(
1011
+ "combiner-load-merging", cl::Hidden, cl::init(true),
1112
+ cl::desc("DAG combine enable merging multiple loads "
@@ -15,7 +16,7 @@ index 5038f8a1f..fe9d45a82 100644
1516
namespace {
1617

1718
class DAGCombiner {
18-
@@ -8874,6 +8880,9 @@ static SDValue stripTruncAndExt(SDValue Value) {
19+
@@ -9053,6 +9060,9 @@ static SDValue stripTruncAndExt(SDValue Value) {
1920
/// =>
2021
/// *((i32)p) = BSWAP(val);
2122
SDValue DAGCombiner::mergeTruncStores(StoreSDNode *N) {
@@ -25,7 +26,7 @@ index 5038f8a1f..fe9d45a82 100644
2526
// The matching looks for "store (trunc x)" patterns that appear early but are
2627
// likely to be replaced by truncating store nodes during combining.
2728
// TODO: If there is evidence that running this later would help, this
28-
@@ -9092,6 +9101,9 @@ SDValue DAGCombiner::MatchLoadCombine(SDNode *N) {
29+
@@ -9277,6 +9287,9 @@ SDValue DAGCombiner::MatchLoadCombine(SDNode *N) {
2930
assert(N->getOpcode() == ISD::OR &&
3031
"Can only match load combining against OR nodes");
3132

@@ -36,10 +37,10 @@ index 5038f8a1f..fe9d45a82 100644
3637
EVT VT = N->getValueType(0);
3738
if (VT != MVT::i16 && VT != MVT::i32 && VT != MVT::i64)
3839
diff --git a/llvm/lib/Transforms/Scalar/SROA.cpp b/llvm/lib/Transforms/Scalar/SROA.cpp
39-
index 17a94f938..623a22913 100644
40+
index e88c130cc..983a7e2b1 100644
4041
--- a/llvm/lib/Transforms/Scalar/SROA.cpp
4142
+++ b/llvm/lib/Transforms/Scalar/SROA.cpp
42-
@@ -123,6 +123,10 @@ static cl::opt<bool> SROAStrictInbounds("sroa-strict-inbounds", cl::init(false),
43+
@@ -120,6 +120,10 @@ STATISTIC(NumVectorized, "Number of vectorized aggregates");
4344
/// Disable running mem2reg during SROA in order to test or debug SROA.
4445
static cl::opt<bool> SROASkipMem2Reg("sroa-skip-mem2reg", cl::init(false),
4546
cl::Hidden);
@@ -50,7 +51,7 @@ index 17a94f938..623a22913 100644
5051
namespace {
5152

5253
class AllocaSliceRewriter;
53-
@@ -1232,6 +1236,11 @@ private:
54+
@@ -1190,6 +1194,11 @@ private:
5455
if (!IsOffsetKnown)
5556
return PI.setAborted(&II);
5657

‎scripts/git-clone.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ esac
2929

3030
OUT_DIR="$(realpath ./)/${1:-out}"
3131
pushd "${OUT_DIR}"
32-
git clone --single-branch --branch solana-tools-v1.51 --recurse-submodules --shallow-submodules https://github.com/anza-xyz/rust.git
33-
git clone --single-branch --branch solana-tools-v1.51 https://github.com/anza-xyz/cargo.git
34-
git clone --single-branch --branch solana-tools-v1.51 https://github.com/anza-xyz/newlib.git
32+
git clone --single-branch --branch solana-tools-v1.53 --recurse-submodules --shallow-submodules https://github.com/anza-xyz/rust.git
33+
git clone --single-branch --branch solana-tools-v1.53 https://github.com/anza-xyz/cargo.git
34+
git clone --single-branch --branch solana-tools-v1.53 https://github.com/anza-xyz/newlib.git
3535

3636
popd

‎scripts/package.sh‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,10 @@ cp -R "rust/build/${HOST_TRIPLE}/stage1/bin" deploy/rust/
5151
cp -R "cargo/target/release/cargo${EXE_SUFFIX}" deploy/rust/bin/
5252
mkdir -p deploy/rust/lib/rustlib/
5353
cp -R "rust/build/${HOST_TRIPLE}/stage1/lib/rustlib/${HOST_TRIPLE}" deploy/rust/lib/rustlib/
54-
cp -R "rust/build/${HOST_TRIPLE}/stage1/lib/rustlib/sbf-solana-solana" deploy/rust/lib/rustlib/
5554
cp -R "rust/build/${HOST_TRIPLE}/stage1/lib/rustlib/sbpf-solana-solana" deploy/rust/lib/rustlib/
5655
cp -R "rust/build/${HOST_TRIPLE}/stage1/lib/rustlib/sbpfv1-solana-solana" deploy/rust/lib/rustlib/
5756
cp -R "rust/build/${HOST_TRIPLE}/stage1/lib/rustlib/sbpfv2-solana-solana" deploy/rust/lib/rustlib/
5857
cp -R "rust/build/${HOST_TRIPLE}/stage1/lib/rustlib/sbpfv3-solana-solana" deploy/rust/lib/rustlib/
59-
cp -R "rust/build/${HOST_TRIPLE}/stage1/lib/rustlib/sbpfv4-solana-solana" deploy/rust/lib/rustlib/
6058
find . -maxdepth 6 -type f -path "./rust/build/${HOST_TRIPLE}/stage1/lib/*" -exec cp {} deploy/rust/lib \;
6159
mkdir -p deploy/rust/lib/rustlib/src/rust
6260
cp "rust/build/${HOST_TRIPLE}/stage1/lib/rustlib/src/rust/Cargo.lock" deploy/rust/lib/rustlib/src/rust
@@ -75,7 +73,7 @@ clang
7573
clang++
7674
clang-cl
7775
clang-cpp
78-
clang-19
76+
clang-20
7977
ld.lld
8078
ld64.lld
8179
llc
@@ -106,7 +104,7 @@ if [[ "${HOST_TRIPLE}" != "x86_64-pc-windows-msvc" ]] ; then
106104
cp -R rust/src/llvm-project/lldb/scripts/solana/* deploy/llvm/bin/
107105
cp -R rust/build/${HOST_TRIPLE}/llvm/lib/liblldb.* deploy/llvm/lib/
108106
if [[ "${HOST_TRIPLE}" == "x86_64-unknown-linux-gnu" || "${HOST_TRIPLE}" == "aarch64-unknown-linux-gnu" ]]; then
109-
cp -r rust/build/${HOST_TRIPLE}/llvm/local/lib/python* deploy/llvm/lib
107+
cp -R rust/build/${HOST_TRIPLE}/llvm/local/lib/python* deploy/llvm/lib
110108
else
111109
cp -R rust/build/${HOST_TRIPLE}/llvm/lib/python* deploy/llvm/lib/
112110
fi

‎scripts/prepare.sh‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,4 +46,9 @@ if [[ "${HOST_TRIPLE}" != "x86_64-pc-windows-msvc" ]] ; then
4646
echo "$( cd newlib && git rev-parse HEAD ) https://github.com/anza-xyz/newlib.git" >> version.md
4747
fi
4848

49+
50+
if [[ "${HOST_TRIPLE}" == *"apple"* ]]; then
51+
( cd rust && ./src/llvm-project/lldb/scripts/macos-setup-codesign.sh )
52+
fi
53+
4954
popd

0 commit comments

Comments
 (0)