Build Windows Arm64 binaries (#441)

solidpixel · web-flow · commit aeece2f609db · 2023-11-24T15:43:46.000Z
diff --git a/Docs/ChangeLog-4x.md b/Docs/ChangeLog-4x.md
@@ -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
diff --git a/jenkins/nightly.Jenkinsfile b/jenkins/nightly.Jenkinsfile
@@ -67,7 +67,7 @@ pipeline {
                 '''
               }
             }
-            stage('Build R') {
+            stage('Build R x64') {
               steps {
                 sh '''
                   mkdir build_rel
@@ -77,7 +77,7 @@ pipeline {
                 '''
               }
             }
-            stage('Build D') {
+            stage('Build D x64') {
               steps {
                 sh '''
                   mkdir build_dbg
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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') {
@@ -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'
             }
diff --git a/jenkins/release.Jenkinsfile b/jenkins/release.Jenkinsfile
@@ -127,7 +127,7 @@ spec:
                 sh 'git clean -ffdx'
               }
             }
-            stage('Build astcenc R') {
+            stage('Build astcenc R x64') {
               steps {
                 sh '''
                   export CXX=clang++-9
@@ -138,7 +138,7 @@ spec:
                 '''
               }
             }
-            stage('Build astcdec R') {
+            stage('Build astcdec R x64') {
               steps {
                 sh '''
                   export CXX=clang++-9
@@ -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
@@ -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') {
@@ -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'
                 }
               }
             }
@@ -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') {
@@ -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'
 

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ pipeline {`
`67`	`67`	`'''`
`68`	`68`	`}`
`69`	`69`	`}`
`70`		`- stage('Build R') {`
	`70`	`+ stage('Build R x64') {`
`71`	`71`	`steps {`
`72`	`72`	`sh '''`
`73`	`73`	`mkdir build_rel`
`@@ -77,7 +77,7 @@ pipeline {`
`77`	`77`	`'''`
`78`	`78`	`}`
`79`	`79`	`}`
`80`		`- stage('Build D') {`
	`80`	`+ stage('Build D x64') {`
`81`	`81`	`steps {`
`82`	`82`	`sh '''`
`83`	`83`	`mkdir build_dbg`
`@@ -122,7 +122,7 @@ pipeline {`
`122`	`122`	`bat 'git clean -ffdx'`
`123`	`123`	`}`
`124`	`124`	`}`
`125`		`- stage('Build R') {`
	`125`	`+ stage('Build R x64') {`
`126`	`126`	`steps {`
`127`	`127`	`bat '''`
`128`	`128`	`call c:\\progra~2\\micros~1\\2022\\buildtools\\vc\\auxiliary\\build\\vcvars64.bat`
`@@ -133,7 +133,7 @@ pipeline {`
`133`	`133`	`'''`
`134`	`134`	`}`
`135`	`135`	`}`
`136`		`- stage('Build D') {`
	`136`	`+ stage('Build D x64') {`
`137`	`137`	`steps {`
`138`	`138`	`bat '''`
`139`	`139`	`call c:\\progra~2\\micros~1\\2022\\buildtools\\vc\\auxiliary\\build\\vcvars64.bat`
`@@ -172,7 +172,7 @@ pipeline {`
`172`	`172`	`bat 'git clean -ffdx'`
`173`	`173`	`}`
`174`	`174`	`}`
`175`		`- stage('Build R') {`
	`175`	`+ stage('Build R x64') {`
`176`	`176`	`steps {`
`177`	`177`	`bat '''`
`178`	`178`	`call c:\\progra~2\\micros~1\\2022\\buildtools\\vc\\auxiliary\\build\\vcvars64.bat`
`@@ -185,7 +185,7 @@ pipeline {`
`185`	`185`	`'''`
`186`	`186`	`}`
`187`	`187`	`}`
`188`		`- stage('Build D') {`
	`188`	`+ stage('Build D x64') {`
`189`	`189`	`steps {`
`190`	`190`	`bat '''`
`191`	`191`	`call c:\\progra~2\\micros~1\\2022\\buildtools\\vc\\auxiliary\\build\\vcvars64.bat`
`@@ -196,11 +196,36 @@ pipeline {`
`196`	`196`	`'''`
`197`	`197`	`}`
`198`	`198`	`}`
	`199`	`+ stage('Build R Arm64') {`
	`200`	`+ steps {`
	`201`	`+ bat '''`
	`202`	`+ call c:\\progra~2\\micros~1\\2022\\buildtools\\vc\\auxiliary\\build\\vcvarsall.bat x64_arm64`
	`203`	`+ mkdir build_rel_arm64`
	`204`	`+ cd build_rel_arm64`
	`205`	`+ cmake -G "Visual Studio 17 2022" -A ARM64 -T ClangCL -DASTCENC_ISA_NEON=ON -DASTCENC_PACKAGE=arm64-clangcl ..`
	`206`	`+ msbuild astcencoder.sln -property:Configuration=Release`
	`207`	`+ '''`
	`208`	`+ }`
	`209`	`+ }`
	`210`	`+ stage('Build D Arm64') {`
	`211`	`+ steps {`
	`212`	`+ bat '''`
	`213`	`+ call c:\\progra~2\\micros~1\\2022\\buildtools\\vc\\auxiliary\\build\\vcvarsall.bat x64_arm64`
	`214`	`+ mkdir build_dbg_arm64`
	`215`	`+ cd build_dbg_arm64`
	`216`	`+ cmake -G "Visual Studio 17 2022" -A ARM64 -T ClangCL -DASTCENC_ISA_NEON=ON ..`
	`217`	`+ msbuild astcencoder.sln -property:Configuration=Debug`
	`218`	`+ '''`
	`219`	`+ }`
	`220`	`+ }`
`199`	`221`	`stage('Stash') {`
`200`	`222`	`steps {`
`201`	`223`	`dir('build_rel') {`
`202`	`224`	`stash name: 'astcenc-windows-x64-clangcl', includes: '*.zip'`
`203`	`225`	`}`
	`226`	`+ dir('build_rel_arm64') {`
	`227`	`+ stash name: 'astcenc-windows-arm64-clangcl', includes: '*.zip'`
	`228`	`+ }`
`204`	`229`	`}`
`205`	`230`	`}`
`206`	`231`	`stage('Test') {`
`@@ -305,6 +330,9 @@ spec:`
`305`	`330`	`dir('upload/windows-x64-clangcl') {`
`306`	`331`	`unstash 'astcenc-windows-x64-clangcl'`
`307`	`332`	`}`
	`333`	`+ dir('upload/windows-arm64-clangcl') {`
	`334`	`+ unstash 'astcenc-windows-arm64-clangcl'`
	`335`	`+ }`
`308`	`336`	`dir('upload/macos-x64') {`
`309`	`337`	`unstash 'astcenc-macos-x64'`
`310`	`338`	`}`
Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ spec:`
`127`	`127`	`sh 'git clean -ffdx'`
`128`	`128`	`}`
`129`	`129`	`}`
`130`		`- stage('Build astcenc R') {`
	`130`	`+ stage('Build astcenc R x64') {`
`131`	`131`	`steps {`
`132`	`132`	`sh '''`
`133`	`133`	`export CXX=clang++-9`
`@@ -138,7 +138,7 @@ spec:`
`138`	`138`	`'''`
`139`	`139`	`}`
`140`	`140`	`}`
`141`		`- stage('Build astcdec R') {`
	`141`	`+ stage('Build astcdec R x64') {`
`142`	`142`	`steps {`
`143`	`143`	`sh '''`
`144`	`144`	`export CXX=clang++-9`
`@@ -178,7 +178,7 @@ spec:`
`178`	`178`	`bat 'git clean -ffdx'`
`179`	`179`	`}`
`180`	`180`	`}`
`181`		`- stage('Build R') {`
	`181`	`+ stage('Build R x64') {`
`182`	`182`	`steps {`
`183`	`183`	`bat '''`
`184`	`184`	`call c:\\progra~2\\micros~1\\2022\\buildtools\\vc\\auxiliary\\build\\vcvars64.bat`
`@@ -191,6 +191,19 @@ spec:`
`191`	`191`	`'''`
`192`	`192`	`}`
`193`	`193`	`}`
	`194`	`+ stage('Build R Arm64') {`
	`195`	`+ steps {`
	`196`	`+ bat '''`
	`197`	`+ call c:\\progra~2\\micros~1\\2022\\buildtools\\vc\\auxiliary\\build\\vcvarsall.bat x64_arm64`
	`198`	`+ mkdir build_rel_arm64`
	`199`	`+ cd build_rel_arm64`
	`200`	`+ cmake -G "Visual Studio 17 2022" -A ARM64 -T ClangCL -DCMAKE_INSTALL_PREFIX=../ -DASTCENC_ISA_NEON=ON -DASTCENC_PACKAGE=arm64 ..`
	`201`	`+ msbuild astcencoder.sln -property:Configuration=Release`
	`202`	`+ msbuild PACKAGE.vcxproj -property:Configuration=Release`
	`203`	`+ msbuild INSTALL.vcxproj -property:Configuration=Release`
	`204`	`+ '''`
	`205`	`+ }`
	`206`	`+ }`
`194`	`207`	`stage('Sign') {`
`195`	`208`	`steps {`
`196`	`209`	`dir('sign_tools') {`
`@@ -208,6 +221,7 @@ spec:`
`208`	`221`	`usernameVariable: 'AF_USER',`
`209`	`222`	`passwordVariable: 'APIKEY')]) {`
`210`	`223`	`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'`
	`224`	`+ 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'`
`211`	`225`	`}`
`212`	`226`	`}`
`213`	`227`	`}`
`@@ -217,6 +231,10 @@ spec:`
`217`	`231`	`stash name: 'astcenc-windows-x64', includes: '*.zip'`
`218`	`232`	`stash name: 'astcenc-windows-x64-hash', includes: '*.zip.sha256'`
`219`	`233`	`}`
	`234`	`+ dir('build_rel_arm64') {`
	`235`	`+ stash name: 'astcenc-windows-arm64', includes: '*.zip'`
	`236`	`+ stash name: 'astcenc-windows-arm64-hash', includes: '*.zip.sha256'`
	`237`	`+ }`
`220`	`238`	`}`
`221`	`239`	`}`
`222`	`240`	`stage('Test') {`
`@@ -321,10 +339,12 @@ spec:`
`321`	`339`	`steps {`
`322`	`340`	`dir('upload') {`
`323`	`341`	`unstash 'astcenc-windows-x64-hash'`
	`342`	`+ unstash 'astcenc-windows-arm64-hash'`
`324`	`343`	`unstash 'astcenc-linux-x64-hash'`
`325`	`344`	`unstash 'astcenc-macos-universal-hash'`
`326`	`345`
`327`	`346`	`unstash 'astcenc-windows-x64'`
	`347`	`+ unstash 'astcenc-windows-arm64'`
`328`	`348`	`unstash 'astcenc-linux-x64'`
`329`	`349`	`unstash 'astcenc-macos-universal'`
`330`	`350`