Address some feedback

Author: aarongreig

.github/CODEOWNERS

@@ -40,11 +40,11 @@ sycl/include/sycl/detail/ur.hpp @intel/unified-runtime-reviewers
 sycl/source/detail/posix_ur.cpp @intel/unified-runtime-reviewers
 sycl/source/detail/ur.cpp @intel/unified-runtime-reviewers
 sycl/source/detail/windows_ur.cpp @intel/unified-runtime-reviewers
-sycl/test-e2e/Plugin/ @intel/unified-runtime-reviewers
+sycl/test-e2e/Adapters/ @intel/unified-runtime-reviewers
 
 # Win Proxy Loader
-sycl/pi_win_proxy_loader @intel/llvm-reviewers-runtime
-sycl/test-e2e/Plugin/dll-detach-order.cpp @intel/llvm-reviewers-runtime
+sycl/ur_win_proxy_loader @intel/llvm-reviewers-runtime
+sycl/test-e2e/Adapters/dll-detach-order.cpp @intel/llvm-reviewers-runtime
 
 # CUDA specific runtime implementations
 sycl/include/sycl/ext/oneapi/experimental/cuda/ @intel/llvm-reviewers-cuda

.github/workflows/sycl-linux-build.yml

@@ -169,7 +169,6 @@ jobs:
           --cmake-opt=-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
           --cmake-opt="-DLLVM_INSTALL_UTILS=ON" \
           --cmake-opt="-DNATIVECPU_USE_OCK=Off" \
-          --cmake-opt="-DSYCL_PI_TESTS=OFF" \
           --cmake-opt="-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=SPIRV"
     - name: Compile
       id: build

.github/workflows/sycl-macos-build-and-test.yml

@@ -53,6 +53,5 @@ jobs:
           --cmake-opt=-DCMAKE_C_COMPILER_LAUNCHER=ccache \
           --cmake-opt=-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
           --cmake-opt="-DLLVM_INSTALL_UTILS=ON" \
-          --cmake-opt="-DSYCL_PI_TESTS=OFF"
     - name: Compile
       run: cmake --build $GITHUB_WORKSPACE/build --target deploy-sycl-toolchain

CONTRIBUTING.md

@@ -58,7 +58,7 @@ To contribute:
   - [The seven rules of a great Git commit message](https://cbea.ms/git-commit)
     are recommended read and follow.
 - To a reasonable extent, title tags can be used to signify the component
-  changed, e.g.: `[PI]`, `[CUDA]`, `[Doc]`.
+  changed, e.g.: `[UR]`, `[CUDA]`, `[Doc]`.
 - Create a pull request (PR) for your changes following
   [Creating a pull request instructions](https://help.github.com/articles/creating-a-pull-request/).
   - Make sure PR has a good description explaining all of the changes made,

buildbot/configure.py

@@ -68,7 +68,7 @@ def do_configure(args):
     if sys.platform != "darwin":
         sycl_enabled_backends.append("level_zero")
 
-    # lld is needed on Windows or for the HIP plugin on AMD
+    # lld is needed on Windows or for the HIP adapter on AMD
     if platform.system() == "Windows" or (args.hip and args.hip_platform == "AMD"):
         llvm_enable_projects += ";lld"
 
@@ -152,8 +152,8 @@ def do_configure(args):
                 libclc_targets_to_build += libclc_nvidia_target_names
             libclc_gen_remangled_variants = "ON"
 
-    if args.enable_plugin:
-        sycl_enabled_backends += args.enable_plugin
+    if args.enable_backends:
+        sycl_enabled_backends += args.enable_backends
 
     if args.disable_preview_lib:
         sycl_preview_lib = "OFF"
@@ -372,7 +372,7 @@ def main():
     parser.add_argument(
         "--ci-defaults", action="store_true", help="Enable default CI parameters"
     )
-    parser.add_argument("--enable-plugin", action="append", help="Enable SYCL plugin")
+    parser.add_argument("--enable-backends", action="append", help="Enable SYCL backend")
     parser.add_argument(
         "--disable-preview-lib",
         action="store_true",

sycl/cmake/modules/AddSYCL.cmake

@@ -33,67 +33,3 @@ function(add_sycl_library LIB_NAME TYPE)
   # TODO remove add_common_options
   add_common_options(${LIB_NAME})
 endfunction()
-
-# current ur adapter dependency managing is a bit hacky, we should try to copy
-# this as closely as possible instead
-function(add_sycl_plugin PLUGIN_NAME)
-  cmake_parse_arguments("ARG"
-    ""
-    ""
-    "SOURCES;INCLUDE_DIRS;LIBRARIES;HEADER"
-    ${ARGN}
-  )
-
-  add_sycl_library("pi_${PLUGIN_NAME}" SHARED
-    LINKER_SCRIPT "${PROJECT_SOURCE_DIR}/plugins/ld-version-script.txt"
-    SOURCES ${ARG_SOURCES}
-    INCLUDE_DIRS
-      ${ARG_INCLUDE_DIRS}
-      ${sycl_inc_dir}
-    LIBRARIES
-      ${ARG_LIBRARIES}
-      OpenCL-Headers
-  )
-
-  # All SYCL plugins use UR sources.
-  # Disable errors from warnings and apply other workarounds while building the UR.
-  if(WIN32)
-    target_compile_options("pi_${PLUGIN_NAME}" PRIVATE /WX- /UUNICODE /DUSE_Z7=ON)
-  else()
-    target_compile_options("pi_${PLUGIN_NAME}" PRIVATE -Wno-error)
-  endif()
-
-  # Install feature test header
-  if (NOT "${ARG_HEADER}" STREQUAL "")
-    get_filename_component(HEADER_NAME ${ARG_HEADER} NAME)
-    configure_file(
-      ${ARG_HEADER}
-      ${SYCL_INCLUDE_BUILD_DIR}/sycl/detail/plugins/${PLUGIN_NAME}/${HEADER_NAME}
-      COPYONLY)
-
-    install(FILES ${ARG_HEADER}
-            DESTINATION ${SYCL_INCLUDE_DIR}/sycl/detail/plugins/${PLUGIN_NAME}
-            COMPONENT pi_${PLUGIN_NAME})
-  endif()
-
-  install(TARGETS pi_${PLUGIN_NAME}
-    LIBRARY DESTINATION "lib${LLVM_LIBDIR_SUFFIX}" COMPONENT pi_${PLUGIN_NAME}
-    RUNTIME DESTINATION "bin" COMPONENT pi_${PLUGIN_NAME})
-
-  set (manifest_file
-    ${CMAKE_CURRENT_BINARY_DIR}/install_manifest_pi_${PLUGIN_NAME}.txt)
-  add_custom_command(OUTPUT ${manifest_file}
-    COMMAND "${CMAKE_COMMAND}"
-    "-DCMAKE_INSTALL_COMPONENT=pi_${PLUGIN_NAME}"
-    -P "${CMAKE_BINARY_DIR}/cmake_install.cmake"
-    COMMENT "Deploying component pi_${PLUGIN_NAME}"
-    USES_TERMINAL
-  )
-  add_custom_target(install-sycl-plugin-${PLUGIN_NAME}
-    DEPENDS
-      ${manifest_file} pi_${PLUGIN_NAME}
-    )
-
-  set_property(GLOBAL APPEND PROPERTY SYCL_TOOLCHAIN_INSTALL_COMPONENTS
-    pi_${PLUGIN_NAME})
-endfunction()