Skip to content

Commit

Permalink
Build Windows Arm64 binaries (#441)
Browse files Browse the repository at this point in the history
  • Loading branch information
@solidpixel
solidpixel committed Nov 24, 2023
1 parent 19b19f9 commit aeece2f
Show file tree
Hide file tree
Showing 3 changed files with 59 additions and 9 deletions.
2 changes: 2 additions & 0 deletions Docs/ChangeLog-4x.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ large core count Windows systems.
use more than 64 cores on large core count systems. This change doubled
command line performance for `-exhastive` compression when testing on an
96 core/192 thread system.
* **Feature:** Windows Arm64 native builds of the `astcenc` command line tool
are now included in the prebuilt release binaries.

<!-- ---------------------------------------------------------------------- -->
## 4.6.0
Expand Down
40 changes: 34 additions & 6 deletions jenkins/nightly.Jenkinsfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ pipeline {
'''
}
}
stage('Build R') {
stage('Build R x64') {
steps {
sh '''
mkdir build_rel
Expand All @@ -77,7 +77,7 @@ pipeline {
'''
}
}
stage('Build D') {
stage('Build D x64') {
steps {
sh '''
mkdir build_dbg
Expand Down Expand Up @@ -122,7 +122,7 @@ pipeline {
bat 'git clean -ffdx'
}
}
stage('Build R') {
stage('Build R x64') {
steps {
bat '''
call c:\\progra~2\\micros~1\\2022\\buildtools\\vc\\auxiliary\\build\\vcvars64.bat
Expand All @@ -133,7 +133,7 @@ pipeline {
'''
}
}
stage('Build D') {
stage('Build D x64') {
steps {
bat '''
call c:\\progra~2\\micros~1\\2022\\buildtools\\vc\\auxiliary\\build\\vcvars64.bat
Expand Down Expand Up @@ -172,7 +172,7 @@ pipeline {
bat 'git clean -ffdx'
}
}
stage('Build R') {
stage('Build R x64') {
steps {
bat '''
call c:\\progra~2\\micros~1\\2022\\buildtools\\vc\\auxiliary\\build\\vcvars64.bat
Expand All @@ -185,7 +185,7 @@ pipeline {
'''
}
}
stage('Build D') {
stage('Build D x64') {
steps {
bat '''
call c:\\progra~2\\micros~1\\2022\\buildtools\\vc\\auxiliary\\build\\vcvars64.bat
Expand All @@ -196,11 +196,36 @@ pipeline {
'''
}
}
stage('Build R Arm64') {
steps {
bat '''
call c:\\progra~2\\micros~1\\2022\\buildtools\\vc\\auxiliary\\build\\vcvarsall.bat x64_arm64
mkdir build_rel_arm64
cd build_rel_arm64
cmake -G "Visual Studio 17 2022" -A ARM64 -T ClangCL -DASTCENC_ISA_NEON=ON -DASTCENC_PACKAGE=arm64-clangcl ..
msbuild astcencoder.sln -property:Configuration=Release
'''
}
}
stage('Build D Arm64') {
steps {
bat '''
call c:\\progra~2\\micros~1\\2022\\buildtools\\vc\\auxiliary\\build\\vcvarsall.bat x64_arm64
mkdir build_dbg_arm64
cd build_dbg_arm64
cmake -G "Visual Studio 17 2022" -A ARM64 -T ClangCL -DASTCENC_ISA_NEON=ON ..
msbuild astcencoder.sln -property:Configuration=Debug
'''
}
}
stage('Stash') {
steps {
dir('build_rel') {
stash name: 'astcenc-windows-x64-clangcl', includes: '*.zip'
}
dir('build_rel_arm64') {
stash name: 'astcenc-windows-arm64-clangcl', includes: '*.zip'
}
}
}
stage('Test') {
Expand Down Expand Up @@ -305,6 +330,9 @@ spec:
dir('upload/windows-x64-clangcl') {
unstash 'astcenc-windows-x64-clangcl'
}
dir('upload/windows-arm64-clangcl') {
unstash 'astcenc-windows-arm64-clangcl'
}
dir('upload/macos-x64') {
unstash 'astcenc-macos-x64'
}
Expand Down
26 changes: 23 additions & 3 deletions jenkins/release.Jenkinsfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ spec:
sh 'git clean -ffdx'
}
}
stage('Build astcenc R') {
stage('Build astcenc R x64') {
steps {
sh '''
export CXX=clang++-9
Expand All @@ -138,7 +138,7 @@ spec:
'''
}
}
stage('Build astcdec R') {
stage('Build astcdec R x64') {
steps {
sh '''
export CXX=clang++-9
Expand Down Expand Up @@ -178,7 +178,7 @@ spec:
bat 'git clean -ffdx'
}
}
stage('Build R') {
stage('Build R x64') {
steps {
bat '''
call c:\\progra~2\\micros~1\\2022\\buildtools\\vc\\auxiliary\\build\\vcvars64.bat
Expand All @@ -191,6 +191,19 @@ spec:
'''
}
}
stage('Build R Arm64') {
steps {
bat '''
call c:\\progra~2\\micros~1\\2022\\buildtools\\vc\\auxiliary\\build\\vcvarsall.bat x64_arm64
mkdir build_rel_arm64
cd build_rel_arm64
cmake -G "Visual Studio 17 2022" -A ARM64 -T ClangCL -DCMAKE_INSTALL_PREFIX=../ -DASTCENC_ISA_NEON=ON -DASTCENC_PACKAGE=arm64 ..
msbuild astcencoder.sln -property:Configuration=Release
msbuild PACKAGE.vcxproj -property:Configuration=Release
msbuild INSTALL.vcxproj -property:Configuration=Release
'''
}
}
stage('Sign') {
steps {
dir('sign_tools') {
Expand All @@ -208,6 +221,7 @@ spec:
usernameVariable: 'AF_USER',
passwordVariable: 'APIKEY')]) {
powershell 'C:\\Python311\\python.exe .\\sign_tools\\windows-client-wrapper.py -b $Env:BUILD_NUMBER -t $Env:APIKEY (Get-ChildItem -Filter build_rel\\*.zip)[0].FullName'
powershell 'C:\\Python311\\python.exe .\\sign_tools\\windows-client-wrapper.py -b $Env:BUILD_NUMBER -t $Env:APIKEY (Get-ChildItem -Filter build_rel_arm64\\*.zip)[0].FullName'
}
}
}
Expand All @@ -217,6 +231,10 @@ spec:
stash name: 'astcenc-windows-x64', includes: '*.zip'
stash name: 'astcenc-windows-x64-hash', includes: '*.zip.sha256'
}
dir('build_rel_arm64') {
stash name: 'astcenc-windows-arm64', includes: '*.zip'
stash name: 'astcenc-windows-arm64-hash', includes: '*.zip.sha256'
}
}
}
stage('Test') {
Expand Down Expand Up @@ -321,10 +339,12 @@ spec:
steps {
dir('upload') {
unstash 'astcenc-windows-x64-hash'
unstash 'astcenc-windows-arm64-hash'
unstash 'astcenc-linux-x64-hash'
unstash 'astcenc-macos-universal-hash'

unstash 'astcenc-windows-x64'
unstash 'astcenc-windows-arm64'
unstash 'astcenc-linux-x64'
unstash 'astcenc-macos-universal'

Expand Down

0 comments on commit aeece2f

Please sign in to comment.