Windows clang -- proof-of-concept

.ci/build-windows-clang-cl.ps1

@@ -0,0 +1,143 @@
+# .ci/build-windows-clang-cl.ps1
+# Enable strict error handling
+$ErrorActionPreference = "Stop"
+
+trap {
+    Write-Host "ERROR: $($_.Exception.Message)"
+    exit 1
+}
+
+Write-Host "Starting RPCS3 build (PowerShell script)"
+
+# Automatically find clang_rt.builtins-x86_64.lib
+Write-Host "Searching for clang_rt.builtins-x86_64.lib ..."
+$clangBuiltinsLibPath = Get-ChildItem -Path "C:/Program Files/LLVM/lib/clang" -Recurse -Filter "clang_rt.builtins-x86_64.lib" -ErrorAction SilentlyContinue |
+    Where-Object { $_.FullName -match "windows\\clang_rt\.builtins-x86_64\.lib$" } |
+    Select-Object -First 1
+
+if (-not $clangBuiltinsLibPath) {
+    Write-Error "Could not find clang_rt.builtins-x86_64.lib in LLVM installation."
+    exit 1
+}
+
+function Get-ShortPath([string]$path) {
+    $fso = New-Object -ComObject Scripting.FileSystemObject
+    return $fso.GetFolder($path).ShortPath
+}
+
+$clangBuiltinsDir = Split-Path -Parent $clangBuiltinsLibPath.FullName
+$clangBuiltinsDirShort = Get-ShortPath $clangBuiltinsDir
+$clangBuiltinsLib = Split-Path -Leaf $clangBuiltinsLibPath.FullName
+$clangPath = "C:\Program Files\LLVM\bin"
+#$clangPath = Get-ChildItem -Path "D:\a\rpcs3\rpcs3\llvm-*\bin"
+#$llvmPath = Get-ChildItem -Path "D:\a\rpcs3\rpcs3\llvm-*\lib\cmake\llvm"
+
+Write-Host "Found Clang builtins library: $clangBuiltinsLib in $clangBuiltinsDir or short $clangBuiltinsDirShort"
+Write-Host "Found Clang Path: $clangPath"
+
+# Get Windows Kits root from registry
+$kitsRoot = Get-ItemProperty -Path "HKLM:\SOFTWARE\Microsoft\Windows Kits\Installed Roots" -Name "KitsRoot10"
+$kitsRootPath = $kitsRoot.KitsRoot10
+
+# Search for mt.exe in x64 SDK bin directories
+Write-Host "Searching for mt.exe ..."
+$mtPath = Get-ChildItem -Path "$clangPath" -Recurse -Filter "llvm-mt.exe" -ErrorAction SilentlyContinue |
+    Where-Object { $_.FullName -match "\\llvm-mt\.exe$" } |
+    Sort-Object FullName -Descending |
+    Select-Object -First 1
+
+if (-not $mtPath) {
+    Write-Error "Could not find mt.exe in Windows Kits directories."
+    exit 1
+}
+
+$mtExePath = "$mtPath"
+
+Write-Host "Found mt.exe at: $mtExePath"
+
+$VcpkgRoot="$(Get-Location)/vcpkg"
+$VcpkgTriplet=$env:VCPKG_TRIPLET
+$VcpkgInstall="$VcpkgRoot/installed/$VcpkgTriplet"
+$VcpkgInclude="$VcpkgInstall/include"
+$VcpkgLib="$VcpkgInstall/lib"
+$VcpkgBin="$VcpkgInstall/bin"
+
+# Configure git safe directory
+Write-Host "Configuring git safe directory"
+& git config --global --add safe.directory '*'
+
+# Initialize submodules except certain ones
+Write-Host "Initializing submodules"
+$excludedSubs = @('llvm','opencv','ffmpeg','FAudio','zlib','libpng','feralinteractive')
+
+# Get submodule paths excluding those in $excludedSubs
+$submodules = Select-String -Path .gitmodules -Pattern 'path = (.+)' | ForEach-Object {
+    $_.Matches[0].Groups[1].Value
+} | Where-Object {
+    $path = $_
+    -not ($excludedSubs | Where-Object { $path -like "*$_*" })
+}
+
+Write-Host "Updating submodules: $($submodules -join ', ')"
+& git submodule update --init --quiet $submodules
+& git -C 3rdparty/OpenAL/openal-soft reset --hard master
+
+# Create and enter build directory
+Write-Host "Creating build directory"
+if (!(Test-Path build)) {
+    New-Item -ItemType Directory -Path build | Out-Null
+}
+Set-Location build
+Write-Host "Changed directory to: $(Get-Location)"
+
+# Run CMake with Ninja generator and required flags
+Write-Host "Running CMake configuration"
+& cmake .. `
+    -G Ninja `
+    -DCMAKE_BUILD_TYPE=Release `
+    -DCMAKE_C_COMPILER="$clangPath/clang-cl.exe" `
+    -DCMAKE_CXX_COMPILER="$clangPath/clang-cl.exe" `
+    -DCMAKE_LINKER="$clangPath/lld-link.exe" `
+    -DCMAKE_INSTALL_PREFIX=/usr `
+    -DCMAKE_TOOLCHAIN_FILE="$VcpkgRoot/scripts/buildsystems/vcpkg.cmake" `
+    -DCMAKE_EXE_LINKER_FLAGS="/LIBPATH:$clangBuiltinsDirShort /defaultlib:$clangBuiltinsLib" `
+    -DCMAKE_MT="$clangPath/llvm-mt.exe" `
+    -DUSE_NATIVE_INSTRUCTIONS=OFF `
+    -DUSE_PRECOMPILED_HEADERS=OFF `
+    -DVCPKG_TARGET_TRIPLET="$VcpkgTriplet" `
+    -DFFMPEG_INCLUDE_DIR="$VcpkgInclude" `
+    -DFFMPEG_LIBAVCODEC="$VcpkgLib/avcodec.lib" `
+    -DFFMPEG_LIBAVFORMAT="$VcpkgLib/avformat.lib" `
+    -DFFMPEG_LIBAVUTIL="$VcpkgLib/avutil.lib" `
+    -DFFMPEG_LIBSWSCALE="$VcpkgLib/swscale.lib" `
+    -DFFMPEG_LIBSWRESAMPLE="$VcpkgLib/swresample.lib" `
+    -DUSE_SYSTEM_CURL=OFF `
+    -DUSE_FAUDIO=OFF `
+    -DUSE_SDL=ON `
+    -DUSE_SYSTEM_SDL=OFF `
+    -DUSE_SYSTEM_FFMPEG=ON `
+    -DUSE_SYSTEM_OPENCV=ON `
+    -DUSE_SYSTEM_OPENAL=OFF `
+    -DUSE_SYSTEM_LIBPNG=ON `
+    -DUSE_DISCORD_RPC=ON `
+    -DUSE_SYSTEM_ZSTD=ON `
+    -DWITH_LLVM=ON `
+    -DSTATIC_LINK_LLVM=ON `
+    -DBUILD_RPCS3_TESTS=OFF
+
+Write-Host "CMake configuration complete"
+
+# Build with ninja
+Write-Host "Starting build with Ninja..."
+& ninja
+if ($LASTEXITCODE -ne 0) {
+    Write-Host "Build failed with exit code $LASTEXITCODE"
+	exit 1
+}
+
+Write-Host "Build succeeded"
+
+# Go back to root directory
+Set-Location ..
+Write-Host "Returned to root directory: $(Get-Location)"
+

.ci/build-windows-clang.sh

@@ -6,6 +6,7 @@ git config --global --add safe.directory '*'
 # Note: Tried to use git submodule status, but it takes over 20 seconds
 # shellcheck disable=SC2046
 git submodule -q update --init $(awk '/path/ && !/llvm/ && !/opencv/ && !/ffmpeg/ && !/curl/ && !/FAudio/ && !/zlib/ { print $3 }' .gitmodules)
+git -C 3rdparty/OpenAL/openal-soft reset --hard master
 
 mkdir build && cd build || exit 1
 
@@ -57,5 +58,5 @@ cd ..
 
 # If it compiled succesfully let's deploy.
 if [ "$build_status" -eq 0 ]; then
-    .ci/deploy-windows-clang.sh "x86_64"
+    echo "Build succeeded"
 fi

.ci/deploy-windows-clang-cl.sh

@@ -0,0 +1,42 @@
+#!/bin/sh -ex
+
+# source ci-vars.env
+# shellcheck disable=SC1091
+. .ci/ci-vars.env
+
+cd build || exit 1
+
+CPU_ARCH="${1:-x86_64}"
+
+echo "Deploying rpcs3 windows clang-cl $CPU_ARCH"
+
+# First let's print some info about our caches
+C:/Strawberry/c/bin/ccache.exe --show-stats -v
+
+# BUILD_blablabla is CI specific, so we wrap it for portability
+ARTIFACT_DIR="$BUILD_ARTIFACTSTAGINGDIRECTORY"
+
+# Remove unecessary files
+rm -f ./bin/vulkan-1.dll
+
+# Prepare compatibility and SDL database for packaging
+mkdir ./bin/config
+mkdir ./bin/config/input_configs
+curl -fsSL 'https://raw.githubusercontent.com/gabomdq/SDL_GameControllerDB/master/gamecontrollerdb.txt' 1> ./bin/config/input_configs/gamecontrollerdb.txt
+curl -fsSL 'https://rpcs3.net/compatibility?api=v1&export' | iconv -t UTF-8 1> ./bin/GuiConfigs/compat_database.dat
+
+# Download SSL certificate (not needed with CURLSSLOPT_NATIVE_CA)
+#curl -fsSL 'https://curl.haxx.se/ca/cacert.pem' 1> ./bin/cacert.pem
+
+# Package artifacts
+7z a -m0=LZMA2 -mx9 "$BUILD" ./bin/*
+
+# Generate sha256 hashes
+# Write to file for GitHub releases
+sha256sum "$BUILD" | awk '{ print $1 }' | tee "$BUILD.sha256"
+echo "$(cat "$BUILD.sha256");$(stat -c %s "$BUILD")B" > GitHubReleaseMessage.txt
+
+# Move files to publishing directory
+mkdir "$ARTIFACT_DIR"
+cp -- "$BUILD" "$ARTIFACT_DIR"
+cp -- "$BUILD.sha256" "$ARTIFACT_DIR"