From b4e0c9fb55132916ff765d18f2d21907bd1c92ea Mon Sep 17 00:00:00 2001 From: pal1000 Date: Tue, 21 Jul 2020 22:35:45 +0300 Subject: [PATCH] Remove LLVM 7 backend support. It has been removed upstream https://swiftshader.googlesource.com/SwiftShader/+/6a6ae44f628d1bc72b1e196e34903a8fd545d15b --- azure-pipelines.yml | 6 ++--- buildscript/build.cmd | 4 --- buildscript/ci/x64-llvm10.cmd | 1 - buildscript/ci/x64-llvm7.cmd | 40 ----------------------------- buildscript/ci/x86-llvm10.cmd | 1 - buildscript/ci/x86-llvm7.cmd | 34 ------------------------ buildscript/modules/swiftshader.cmd | 7 ----- 7 files changed, 2 insertions(+), 91 deletions(-) delete mode 100644 buildscript/ci/x64-llvm7.cmd delete mode 100644 buildscript/ci/x86-llvm7.cmd diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 1839d48..3046eb9 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,7 +1,7 @@ pr: none trigger: none schedules: - - cron: '5 0,8,16 * * *' + - cron: '0 0,8,16 * * *' branches: include: - master @@ -12,12 +12,10 @@ jobs: pool: vmImage: windows-latest strategy: - maxParallel: 3 + maxParallel: 2 matrix: LLVM10: REACTOR_BACKEND: LLVM10 - LLVM7: - REACTOR_BACKEND: LLVM7 subzero: REACTOR_BACKEND: subzero steps: diff --git a/buildscript/build.cmd b/buildscript/build.cmd index 223a9f9..306c6bc 100644 --- a/buildscript/build.cmd +++ b/buildscript/build.cmd @@ -43,15 +43,11 @@ @rem Dump build environment information @call %devroot%\%projectname%\buildscript\modules\envdump.cmd -@IF /I "%1"=="x86-llvm7" echo ------------------------------------------- -@IF /I "%1"=="x64-llvm7" echo ------------------------------------------- @IF /I "%1"=="x86-llvm10" echo -------------------------------------------- @IF /I "%1"=="x64-llvm10" echo -------------------------------------------- @IF /I "%1"=="x86-subzero" echo --------------------------------------------- @IF /I "%1"=="x64-subzero" echo --------------------------------------------- @IF %cimode% EQU 1 echo Build job %1 completed successfully. -@IF /I "%1"=="x86-llvm7" echo ------------------------------------------- -@IF /I "%1"=="x64-llvm7" echo ------------------------------------------- @IF /I "%1"=="x86-llvm10" echo -------------------------------------------- @IF /I "%1"=="x64-llvm10" echo -------------------------------------------- @IF /I "%1"=="x86-subzero" echo --------------------------------------------- diff --git a/buildscript/ci/x64-llvm10.cmd b/buildscript/ci/x64-llvm10.cmd index 5326f2c..70dba4a 100644 --- a/buildscript/ci/x64-llvm10.cmd +++ b/buildscript/ci/x64-llvm10.cmd @@ -25,7 +25,6 @@ @set vk-swiftshader=y @set gles-swiftshader=y @set subzerojit=n -@set newllvm=y @set spirvtools=y @set test-swiftshader=n @set cleanbuild=y diff --git a/buildscript/ci/x64-llvm7.cmd b/buildscript/ci/x64-llvm7.cmd deleted file mode 100644 index 1366af5..0000000 --- a/buildscript/ci/x64-llvm7.cmd +++ /dev/null @@ -1,40 +0,0 @@ -@echo ----------------------------------------------------------- -@echo BUILDING SWIFTSHADER WITH LLVM7 BACKEND FOR X64 ARHITECTURE -@echo ----------------------------------------------------------- - -@set llvmtenbroken=n - -@rem modules\abi.cmd -@set x64=y - -@rem modules\toolchain.cmd -@set selecttoolchain=1 -@set addvcpp=n - -@rem modules\discoverpython.cmd -@set pyselect=1 - -@rem modules\pythonpackages.cmd -@set pyupd=n -@IF EXIST %devroot%\%projectname%\buildscript\assets\ciparallel.* set pyupd=y -@IF /I "%llvmtenbroken%"=="y" set pyupd=y - -@rem modules\throttle.cmd -@set throttle=%NUMBER_OF_PROCESSORS% - -@rem modules\swiftshader.cmd -@set buildswiftshader=y -@set srcupd=n -@set ninja=n -@set vk-swiftshader=y -@set gles-swiftshader=y -@set subzerojit=n -@set newllvm=n -@set spirvtools=y -@set test-swiftshader=n -@set cleanbuild=y - -@rem modules\envdump.cmd -@set enableenvdump=n -@IF EXIST %devroot%\%projectname%\buildscript\assets\ciparallel.* set enableenvdump=y -@IF /I "%llvmtenbroken%"=="y" set enableenvdump=y \ No newline at end of file diff --git a/buildscript/ci/x86-llvm10.cmd b/buildscript/ci/x86-llvm10.cmd index c293d2d..476c5af 100644 --- a/buildscript/ci/x86-llvm10.cmd +++ b/buildscript/ci/x86-llvm10.cmd @@ -25,7 +25,6 @@ @set vk-swiftshader=y @set gles-swiftshader=y @set subzerojit=n -@set newllvm=y @set spirvtools=y @set test-swiftshader=n @set cleanbuild=y diff --git a/buildscript/ci/x86-llvm7.cmd b/buildscript/ci/x86-llvm7.cmd deleted file mode 100644 index eb157d3..0000000 --- a/buildscript/ci/x86-llvm7.cmd +++ /dev/null @@ -1,34 +0,0 @@ -@echo ----------------------------------------------------------- -@echo BUILDING SWIFTSHADER WITH LLVM7 BACKEND FOR X86 ARHITECTURE -@echo ----------------------------------------------------------- - -@rem modules\abi.cmd -@set x64=n - -@rem modules\toolchain.cmd -@set selecttoolchain=1 -@set addvcpp=n - -@rem modules\discoverpython.cmd -@set pyselect=1 - -@rem modules\pythonpackages.cmd -@set pyupd=n - -@rem modules\throttle.cmd -@set throttle=%NUMBER_OF_PROCESSORS% - -@rem modules\swiftshader.cmd -@set buildswiftshader=y -@set srcupd=n -@set ninja=n -@set vk-swiftshader=y -@set gles-swiftshader=y -@set subzerojit=n -@set newllvm=n -@set spirvtools=y -@set test-swiftshader=n -@set cleanbuild=y - -@rem modules\envdump.cmd -@set enableenvdump=n \ No newline at end of file diff --git a/buildscript/modules/swiftshader.cmd b/buildscript/modules/swiftshader.cmd index 85728b9..a4e55cc 100644 --- a/buildscript/modules/swiftshader.cmd +++ b/buildscript/modules/swiftshader.cmd @@ -82,13 +82,6 @@ @IF /I "%subzerojit%"=="y" set buildconf=%buildconf% -DREACTOR_BACKEND=Subzero @IF /I NOT "%subzerojit%"=="y" set buildconf=%buildconf% -DREACTOR_BACKEND=LLVM -@IF %cimode% EQU 0 set "newllvm=" -@IF %cimode% EQU 0 IF /I NOT "%subzerojit%"=="y" set /p newllvm=Use new LLVM 10 JIT instead of LLVM 7 - default^:no (y/n)^: -@IF %cimode% EQU 1 IF /I NOT "%subzerojit%"=="y" echo Use new LLVM 10 JIT instead of LLVM 7 - default^:no (y/n)^:%newllvm% -@IF /I NOT "%subzerojit%"=="y" echo. -@IF /I NOT "%newllvm%"=="y" IF /I NOT "%subzerojit%"=="y" set buildconf=%buildconf% -DSWIFTSHADER_LLVM_VERSION=7.0 -@IF /I "%newllvm%"=="y" IF /I NOT "%subzerojit%"=="y" set buildconf=%buildconf% -DSWIFTSHADER_LLVM_VERSION=10.0 - @IF %cimode% EQU 0 set "spirvtools=" @IF /I NOT "%vk-swiftshader%"=="n" IF %cimode% EQU 0 set /p spirvtools=Include SPIRV-Tools in release - default^:yes (y/n)^: @IF /I NOT "%vk-swiftshader%"=="n" IF %cimode% EQU 1 echo Include SPIRV-Tools in release - default^:yes (y/n)^:%spirvtools%