[SYCL] Fix windows OpenCL CPU RT install script

 - Allow to run out of directory where it is located;
 - Fix version check and diagnostics;
 - Update GetStarted.md to fix naming and highlight TBB
   installation on windows.

Author: vladimirlaz

sycl/doc/GetStartedGuide.md

@@ -161,16 +161,18 @@ which contains all the symbols required.
 To run DPC++ applications on OpenCL devices, OpenCL implementation(s) must be
 present in the system.
 
-The `GPU` and `CPU` runtimes as well as TBB runtime which are needed to run
-DPC++ application on Intel `GPU` or Intel `CPU` devices can be downloaded using
-links in [the dependency configuration file](../../buildbot/dependency.conf)
-and installed following the instructions below. The same versions are used in PR testing.
-
-Intel `CPU` runtime for OpenCL devices can be switched into Intel FPGA
-Emulation device for OpenCL. The following parameter should be set in `cl.cfg`
-file (available in directory containing CPU runtime for OpenCL) or environment
-variable with the same name. The following value should be set to switch OpenCL device
-mode:
+The OpenCL RT for `GPU`, OpenCL RT for `CPU` and TBB runtime which are needed
+to run DPC++ application on Intel `GPU` or Intel `CPU` devices can be
+downloaded using links in
+[the dependency configuration file](../../buildbot/dependency.conf)
+and installed following the instructions below. The same versions are used in
+PR testing.
+
+Intel OpenCL RT for `CPU` devices can be switched into OpenCL runtime for
+Intel FPGA Emulation. The following parameter should be set in `cl.cfg` file
+(available in directory containing CPU runtime for OpenCL) or environment
+variable with the same name. The following value should be set to switch
+OpenCL device mode:
 
 ```bash
 CL_CONFIG_DEVICES = fpga-emu
@@ -226,18 +228,25 @@ folder:
 
 **Windows (64-bit)**:
 
-1) If you need `GPU` as well, then update/install it first. Do it **before**
-installing `CPU` runtime as `GPU` runtime installer may re-write some important
-files or settings and make existing `CPU` runtime not working properly.
+1) If you need OpenCL runtime for Intel `GPU` as well, then update/install it
+first. Do it **before** installing OpenCL runtime for Intel `CPU` runtime as
+OpenCL runtime for Intel `GPU` installer may re-write some important
+files or settings and make existing OpenCL runtime for Intel `CPU` runtime
+not working properly.
+
+2) Extract the archive with OpenCL runtime for Intel `CPU` using links in
+[the dependency configuration file](../../buildbot/dependency.conf).  For
+example, to `c:\oclcpu_rt_<cpu_version>`.
 
-2) Extract the archive to some folder. For example, to
-`c:\oclcpu_rt_<cpu_version>` and `c:\tbb_<tbb_version>`.
+3) Extract the archive with TBB runtime using links in
+[the dependency configuration file](../../buildbot/dependency.conf).  For
+example, to `c:\tbb_<tbb_version>`.
 
-3) Run `Command Prompt` as `Administrator`. To do that click `Start` button,
+4) Run `Command Prompt` as `Administrator`. To do that click `Start` button,
 type `Command Prompt`, click the Right mouse button on it, then click
 `Run As Administrator`, then click `Yes` to confirm.
 
-4) In the opened windows run `install.bat` provided with the extracted files
+5) In the opened windows run `install.bat` provided with the extracted files
 to install runtime to the system and setup environment variables. So, if the
 extracted files are in `c:\oclcpu_rt_<cpu_version>\` folder, then type the
 command:

sycl/tools/install.bat

@@ -7,18 +7,20 @@ echo ### 1. Save and update OpenCL.dll available in the system
 echo ###
 set TMP_FILE=%TEMP%\install.bat.tmp
 
+
+set SYSTEM_OCL_ICD_LOADER=C:\Windows\System32\OpenCL.dll
+set NEW_OCL_ICD_LOADER=%OCL_RT_DIR%\OpenCL.dll
 set INSTALL_ERRORS=0
 
-PowerShell -Command "& {(Get-Command .\OpenCL.dll).FileVersionInfo.FileVersion}" > %TMP_FILE%1
+PowerShell -Command "& {(Get-Command %NEW_OCL_ICD_LOADER%).FileVersionInfo.FileVersion}" > %TMP_FILE%1
 set /p DOWNLOADED_OPENCL_VER= < %TMP_FILE%1
-echo Downloaded OpenCL.dll verison: %DOWNLOADED_OPENCL_VER%
 
-IF EXIST C:\Windows\System32\OpenCL.dll (
-  PowerShell -Command "& {(Get-Command C:\Windows\System32\OpenCL.dll).FileVersionInfo.FileVersion}" > %TMP_FILE%2
-  set /p SYSTEM_OPENCL_VER= < %TMP_FILE%2
-  echo System OpenCL.dll version: %SYSTEM_OPENCL_VER%
+IF EXIST %SYSTEM_OCL_ICD_LOADER% (
+  echo %SYSTEM_OCL_ICD_LOADER% is present. Checking version.
+  PowerShell -Command "& {(Get-Command %SYSTEM_OCL_ICD_LOADER%).FileVersionInfo.FileVersion}" > %TMP_FILE%2
+  set /p SYSTEM_OPENCL_VER=<%TMP_FILE%2
 
-  PowerShell -Command "& {[version]($Env:SYSTEM_OPENCL_VER) -lt ([version]$Env:DOWNLOADED_OPENCL_VER)}" > %TMP_FILE%3
+  PowerShell -Command "& {([version]$Env:SYSTEM_OPENCL_VER) -lt ([version]$Env:DOWNLOADED_OPENCL_VER)}" > %TMP_FILE%3
   set /p NEED_OPENCL_UPGRADE= < %TMP_FILE%3
   set /p NEED_OPENCL_BACKUP= < %TMP_FILE%3
 ) else (
@@ -27,17 +29,20 @@ IF EXIST C:\Windows\System32\OpenCL.dll (
   set NEED_OPENCL_BACKUP=False
 )
 
-echo Need to backup C:\Windows\System32\OpenCL.dll : %NEED_OPENCL_BACKUP%
-echo Need to update C:\Windows\System32\OpenCL.dll : %NEED_OPENCL_UPGRADE%
+echo Downloaded OpenCL.dll version: %DOWNLOADED_OPENCL_VER%
+echo System OpenCL.dll version: %SYSTEM_OPENCL_VER%
+
+echo Need to backup %SYSTEM_OCL_ICD_LOADER% : %NEED_OPENCL_BACKUP%
+echo Need to update %SYSTEM_OCL_ICD_LOADER% : %NEED_OPENCL_UPGRADE%
 echo.
 
 IF %NEED_OPENCL_BACKUP% == True (
-  echo Save system OpenCL.dll: C:\Windows\System32\OpenCL.dll to C:\Windows\System32\OpenCL.dll.%SYSTEM_OPENCL_VER%
-  copy /Y C:\Windows\System32\OpenCL.dll C:\Windows\System32\OpenCL.dll.%SYSTEM_OPENCL_VER%
+  echo Save system OpenCL.dll: %SYSTEM_OCL_ICD_LOADER% to %SYSTEM_OCL_ICD_LOADER%.%SYSTEM_OPENCL_VER%
+  copy /Y %SYSTEM_OCL_ICD_LOADER% %SYSTEM_OCL_ICD_LOADER%.%SYSTEM_OPENCL_VER%
   IF ERRORLEVEL 1 (
     echo !!! Cannot save the original file C:\Windows\System32\OpenCL.dll
     echo !!! Try saving the file manually using File Explorer:
-    echo !!!     C:\Windows\System32\OpenCL.dll to C:\Windows\System32\OpenCL.dll.%SYSTEM_OPENCL_VER%
+    echo !!!     %SYSTEM_OCL_ICD_LOADER% to %SYSTEM_OCL_ICD_LOADER%.%SYSTEM_OPENCL_VER%
     echo !!! Or run this script as Administrator.
     set INSTALL_ERRORS=1
   ) ELSE (
@@ -47,17 +52,17 @@ IF %NEED_OPENCL_BACKUP% == True (
 )
 
 IF %NEED_OPENCL_UPGRADE% == True (
-  echo Replace C:\Windows\System32\OpenCL.dll with the new downloaded OpenCL.dll
+  echo Replace %SYSTEM_OCL_ICD_LOADER% with the new downloaded %NEW_OCL_ICD_LOADER%
 
   rem CHANGE THE FILE ATTRIBUTES. OTHERWISE, IT CANNOT BE REPLACED by regular MOVE, DEL, COPY commands.
-  PowerShell -Command "& {$acl = Get-Acl C:\Windows\System32\OpenCL.dll; $AccessRule = New-Object System.Security.AccessControl.FileSystemAccessRule(\"Users\",\"FullControl\",\"Allow\"); $acl.SetAccessRule($AccessRule); $acl | Set-Acl c:\Windows\System32\OpenCL.dll; }"
+  PowerShell -Command "& {$acl = Get-Acl %SYSTEM_OCL_ICD_LOADER%; $AccessRule = New-Object System.Security.AccessControl.FileSystemAccessRule(\"Users\",\"FullControl\",\"Allow\"); $acl.SetAccessRule($AccessRule); $acl | Set-Acl %SYSTEM_OCL_ICD_LOADER%; }"
 
 
-  copy /Y %OCL_RT_DIR%OpenCL.dll C:\Windows\System32\
+  copy /Y %NEW_OCL_ICD_LOADER% %SYSTEM_OCL_ICD_LOADER%
   IF ERRORLEVEL 1 (
-    echo !!! Cannot copy new OpenCL.dll to C:\Windows\System32\OpenCL.dll
+    echo !!! Cannot copy %NEW_OCL_ICD_LOADER% to %SYSTEM_OCL_ICD_LOADER%
     echo !!! Try copying the file manually using File Explorer:
-    echo !!!     %OCL_RT_DIR%OpenCL.dll to C:\Windows\System32\
+    echo !!!     %NEW_OCL_ICD_LOADER% to %SYSTEM_OCL_ICD_LOADER%
     echo !!! Or run this script as Administrator.
     set INSTALL_ERRORS=1
   ) ELSE (
@@ -130,8 +135,8 @@ echo.
 IF %INSTALL_ERRORS% == 1 (
   echo Installation finished WITH ERRORS!
   echo See recommendations printed above and perform the following actions manually:
-  echo   1. Save C:\Windows\System32\OpenCL.dll to C:\Windows\System32\OpenCL.dll.%SYSTEM_OPENCL_VER%
-  echo   2. Copy %OCL_RT_DIR%OpenCL.dll to C:\Windows\System32\OpenCL.dll
+  echo   1. Save %SYSTEM_OCL_ICD_LOADER% to %SYSTEM_OCL_ICD_LOADER%.%SYSTEM_OPENCL_VER%
+  echo   2. Copy %NEW_OCL_ICD_LOADER% to %SYSTEM_OCL_ICD_LOADER%
   echo   3. Add/set the environment variable OCL_ICD_FILENAMES to %OCL_RT_DIR%intelocl64.dll
   echo   4. Copy TBB libraries or create symbolic links in %OCL_RT_DIR%tbb.
   echo   5. Add/set the environment variable PATH to %OCL_RT_DIR%tbb