Remove LLVM 7 backend support. It has been removed upstream

https://swiftshader.googlesource.com/SwiftShader/+/6a6ae44f628d1bc72b1e196e34903a8fd545d15b
pal1000 · Jul 21, 2020 · b4e0c9f · b4e0c9f
1 parent 16f445e
commit b4e0c9f
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 91 deletions.
diff --git 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
@@ -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
@@ -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
diff --git 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
diff --git 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%