Update "plugin" references in e2e tests

sycl/test-e2e/Adapters/dll-detach-order.cpp

@@ -1,7 +1,8 @@
 // REQUIRES: windows
 // RUN: env SYCL_UR_TRACE=-1 sycl-ls | FileCheck %s
 
-// ensure that the plugins are detached AFTER urLoaderTearDown is done executing
+// ensure that the adapters are detached AFTER urLoaderTearDown is done
+// executing
 
 // CHECK: ---> DLL_PROCESS_DETACH syclx.dll
 

sycl/test-e2e/Adapters/interop-level-zero-buffer-ownership.cpp

@@ -1,5 +1,5 @@
 // REQUIRES: gpu, level_zero, level_zero_dev_kit
-// L0 plugin incorrectly reports memory leaks because it doesn't take into
+// L0 adapter incorrectly reports memory leaks because it doesn't take into
 // account direct calls to L0 API.
 // UNSUPPORTED: ze_debug
 // RUN: %{build} %level_zero_options -o %t.out

sycl/test-e2e/Adapters/interop-level-zero-buffer.cpp

@@ -1,5 +1,5 @@
 // REQUIRES: level_zero, level_zero_dev_kit
-// L0 plugin incorrectly reports memory leaks because it doesn't take into
+// L0 adapter incorrectly reports memory leaks because it doesn't take into
 // account direct calls to L0 API.
 // UNSUPPORTED: ze_debug
 // RUN: %{build} -Wno-error=deprecated-declarations %level_zero_options -o %t.out

sycl/test-e2e/Adapters/interop-level-zero-get-native-mem.cpp

@@ -1,5 +1,5 @@
 // REQUIRES: level_zero, level_zero_dev_kit
-// L0 plugin incorrectly reports memory leaks because it doesn't take into
+// L0 adapter incorrectly reports memory leaks because it doesn't take into
 // account direct calls to L0 API.
 // UNSUPPORTED: ze_debug
 // RUN: %{build} %level_zero_options -o %t.out

sycl/test-e2e/Adapters/level_zero_batch_event_status.cpp

@@ -8,7 +8,7 @@
 
 // level_zero_batch_test.cpp
 //
-// This tests the level zero plugin's kernel batching code.  It specifically
+// This tests the level zero adapter's kernel batching code.  It specifically
 // tests that the current batch is submitted when an Event execution status
 // request is made.  This test uses explicit SYCL_PI_LEVEL_ZERO_BATCH_SIZE=4
 // to make sure that the batching is submitted when the urEventGetInfo is

sycl/test-e2e/Adapters/level_zero_batch_test.cpp

@@ -73,7 +73,7 @@
 
 // level_zero_batch_test.cpp
 //
-// This tests the level zero plugin's kernel batching code.  The default
+// This tests the level zero adapter's kernel batching code.  The default
 // batching is 4, and exact batch size can be controlled with environment
 // variable SYCL_PI_LEVEL_ZEOR+BATCH_SIZE=N.
 // This test enqueues 8 kernels and then does a wait. And it does this 3 times.

sycl/test-e2e/Adapters/level_zero_batch_test_copy_with_compute.cpp

@@ -26,7 +26,7 @@
 
 // level_zero_batch_test_copy_with_compute.cpp
 //
-// This tests the level zero plugin's kernel batching code.  The default
+// This tests the level zero adapter's kernel batching code.  The default
 // batching is 4, and exact batch size can be controlled with environment
 // variable SYCL_PI_LEVEL_ZERO_{COPY_}BATCH_SIZE=N.
 // This test enqueues 8 kernels and then does a wait. And it does this 3 times.

sycl/test-e2e/Adapters/level_zero_dynamic_batch_test.cpp

@@ -12,7 +12,7 @@
 
 // level_zero_dynamic_batch_test.cpp
 //
-// This tests the level zero plugin's kernel dynamic batch size adjustment
+// This tests the level zero adapter's kernel dynamic batch size adjustment
 // code.
 // It starts out by enqueing 40 kernels before it does a wait, and it does
 // this 5 times.  That should cause the dynamic batch size adjustment to

sycl/test-e2e/Adapters/level_zero_events_caching.cpp

@@ -13,7 +13,7 @@
 // CACHING-ENABLED: zeEventCreate = {{[1-9]}}
 // CACHING-DISABLED: zeEventCreate = 256
 
-// Check event caching modes in the L0 plugin.
+// Check event caching modes in the L0 adapter.
 
 #include <sycl/detail/core.hpp>
 

sycl/test-e2e/Adapters/level_zero_imm_cmdlist_per_thread.cpp

@@ -74,10 +74,10 @@ int main() {
   // Create one queue
   auto D = Queue.get_device();
   const char *devType = D.is_cpu() ? "CPU" : "GPU";
-  std::string pluginName = D.get_platform().get_info<info::platform::name>();
+  std::string adapterName = D.get_platform().get_info<info::platform::name>();
   std::cout << "Running on device " << devType << " ("
-            << D.get_info<info::device::name>() << ") " << pluginName
-            << " plugin\n";
+            << D.get_info<info::device::name>() << ") " << adapterName
+            << " adapter\n";
 
   // Use queue in multiple threads
   std::thread T1(run_sample, Queue, 0);

sycl/test-e2e/Adapters/level_zero_track_indirect_access_memory.cpp

@@ -9,7 +9,7 @@
 // Tracking and deferred release is necessary for memory which can be indirectly
 // accessed because such memory can't be released as soon as someone calls free.
 // It can be released only after completion of all kernels which can possibly
-// access this memory indirectly. Currently the Level Zero plugin marks all
+// access this memory indirectly. Currently the Level Zero adapter marks all
 // kernels with indirect access flag conservatively. This flag means that kernel
 // starts to reference all existing memory allocations (even if not explicitly
 // used in the kernel) as soon as it is submitted. That's why basically all

sycl/test-e2e/Adapters/sycl-partition-info.cpp

@@ -1,7 +1,7 @@
 // RUN:  %{build} -o %t.out
 // RUN: %{run} %t.out
 
-// various plugins may return a larger choice of partition properties than SYCL
+// various adapters may return a larger choice of partition properties than SYCL
 // supports ensure we are only returning SYCL standard  partition properties.
 
 #include <cassert>

sycl/test-e2e/Assert/assert_in_simultaneous_kernels.cpp

@@ -7,7 +7,7 @@
 // XFAIL: (opencl && gpu)
 //
 // Since this is a multi-threaded application enable memory tracking and
-// deferred release feature in the Level Zero plugin to avoid releasing memory
+// deferred release feature in the Level Zero adapter to avoid releasing memory
 // too early. This is necessary because currently SYCL RT sets indirect access
 // flag for all kernels and the Level Zero runtime doesn't support deferred
 // release yet.

sycl/test-e2e/Assert/assert_in_simultaneous_kernels_win.cpp

@@ -2,7 +2,7 @@
 // RUN: %{build} -DSYCL_FALLBACK_ASSERT=1 -o %t.out %threads_lib
 //
 // Since this is a multi-threaded application enable memory tracking and
-// deferred release feature in the Level Zero plugin to avoid releasing memory
+// deferred release feature in the Level Zero adapter to avoid releasing memory
 // too early. This is necessary because currently SYCL RT sets indirect access
 // flag for all kernels and the Level Zero runtime doesn't support deferred
 // release yet.

sycl/test-e2e/Assert/assert_in_simultaneously_multiple_tus.cpp

@@ -8,7 +8,7 @@
 // RUN: %{build} -DSYCL_FALLBACK_ASSERT=1 -I %S/Inputs %S/Inputs/kernels_in_file2.cpp -o %t.out %threads_lib
 //
 // Since this is a multi-threaded application enable memory tracking and
-// deferred release feature in the Level Zero plugin to avoid releasing memory
+// deferred release feature in the Level Zero adapter to avoid releasing memory
 // too early. This is necessary because currently SYCL RT sets indirect access
 // flag for all kernels and the Level Zero runtime doesn't support deferred
 // release yet.

sycl/test-e2e/Assert/assert_in_simultaneously_multiple_tus_one_ndebug.cpp

@@ -10,7 +10,7 @@
 // RUN: %if cpu %{ %{run} %t.out &> %t.cpu.txt ; FileCheck %s --input-file %t.cpu.txt %}
 //
 // Since this is a multi-threaded application enable memory tracking and
-// deferred release feature in the Level Zero plugin to avoid releasing memory
+// deferred release feature in the Level Zero adapter to avoid releasing memory
 // too early. This is necessary because currently SYCL RT sets indirect access
 // flag for all kernels and the Level Zero runtime doesn't support deferred
 // release yet.

sycl/test-e2e/Basic/image/srgba-aspect-check.cpp

@@ -5,7 +5,7 @@
 
 int main() {
   sycl::queue q;
-  // Ensure that plugins that don't implement the support can still handle the
+  // Ensure that adapters that don't implement the support can still handle the
   // aspect query.
   std::ignore = q.get_device().has(sycl::aspect::ext_oneapi_srgb);
   return 0;

sycl/test-e2e/Basic/queue/release.cpp

@@ -15,7 +15,7 @@ int main() {
 }
 
 // CHECK: ---> urEnqueueKernelLaunch(
-// FIXME the order of these 2 varies between plugins due to a Level Zero
+// FIXME the order of these 2 varies between adapters due to a Level Zero
 // specific queue workaround.
 // CHECK-DAG: ---> urEventRelease(
 // CHECK-DAG: ---> urQueueRelease(

sycl/test-e2e/Graph/Explicit/interop-level-zero-get-native-mem.cpp

@@ -1,5 +1,5 @@
 // REQUIRES: level_zero, level_zero_dev_kit
-// L0 plugin incorrectly reports memory leaks because it doesn't take into
+// L0 adapter incorrectly reports memory leaks because it doesn't take into
 // account direct calls to L0 API.
 // UNSUPPORTED: ze_debug
 // RUN: %{build} %level_zero_options -o %t.out

sycl/test-e2e/Graph/Explicit/interop-level-zero-launch-kernel.cpp

@@ -1,5 +1,5 @@
 // REQUIRES: level_zero, level_zero_dev_kit
-// L0 plugin incorrectly reports memory leaks because it doesn't take into
+// L0 adapter incorrectly reports memory leaks because it doesn't take into
 // account direct calls to the L0 API.
 // UNSUPPORTED: ze_debug
 // RUN: %{build} %level_zero_options -o %t.out

sycl/test-e2e/Graph/Inputs/interop-level-zero-get-native-mem.cpp

@@ -1,6 +1,6 @@
 // Tests interop with host_task in graph
 // This test was taken from
-// `sycl/test-e2e/Plugin/interop-level-zero-get-native-mem.cpp` This test has
+// `sycl/test-e2e/Adapter/interop-level-zero-get-native-mem.cpp` This test has
 // been simplified to only work with signle device.
 
 #include "../graph_common.hpp"

sycl/test-e2e/Graph/RecordReplay/interop-level-zero-get-native-mem.cpp

@@ -1,5 +1,5 @@
 // REQUIRES: level_zero, level_zero_dev_kit
-// L0 plugin incorrectly reports memory leaks because it doesn't take into
+// L0 adapter incorrectly reports memory leaks because it doesn't take into
 // account direct calls to L0 API.
 // UNSUPPORTED: ze_debug
 // RUN: %{build} %level_zero_options -o %t.out

sycl/test-e2e/Graph/RecordReplay/interop-level-zero-launch-kernel.cpp

@@ -1,5 +1,5 @@
 // REQUIRES: level_zero, level_zero_dev_kit
-// L0 plugin incorrectly reports memory leaks because it doesn't take into
+// L0 adapter incorrectly reports memory leaks because it doesn't take into
 // account direct calls to the L0 API.
 // UNSUPPORTED: ze_debug
 // RUN: %{build} %level_zero_options -o %t.out

sycl/test-e2e/KernelAndProgram/level-zero-static-link-flow.cpp

@@ -6,7 +6,7 @@
 //==--- level-zero-static-link-flow.cpp.cpp - Check L0 static link flow --==//
 //
 // Run a simple program that uses online linking and verify that the sequence
-// of calls to the plugin and to the Level Zero driver are consistent with the
+// of calls to the adapter and to the Level Zero driver are consistent with the
 // "static linking" implementation.
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

sycl/test-e2e/OneapiDeviceSelector/illegal_input_hang.cpp

@@ -4,7 +4,7 @@
 #include <vector>
 
 // Check that the application does not hang when we attempt
-// to initialize plugins multiple times with invalid values
+// to initialize adapters multiple times with invalid values
 // of ONEAPI_DEVICE_SELECTOR.
 int main() {
   for (int I = 0; I < 3; ++I) {

sycl/test-e2e/Scheduler/InOrderQueueDeps.cpp

@@ -4,7 +4,7 @@
 // XFAIL: hip_nvidia
 
 // The tested functionality is disabled with Level Zero until it is supported by
-// the plugin.
+// the adapter.
 // UNSUPPORTED: level_zero
 //==----------------------- InOrderQueueDeps.cpp ---------------------------==//
 //

sycl/test-e2e/Tracing/buffer_printers.cpp

@@ -6,7 +6,7 @@
 #include <sycl/detail/core.hpp>
 #include <vector>
 
-// Test image-specific printers of the Plugin Interace
+// Test the buffer-specific printers of UR tracing.
 //
 //CHECK: ---> urEnqueueMemBufferCopyRect(
 //CHECK-SAME: .srcOrigin = (struct ur_rect_offset_t){.x = 64, .y = 5, .z = 0}

sycl/test-e2e/Tracing/image_printers.cpp

@@ -3,7 +3,7 @@
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
-// Test image-specific printers of the Plugin Interace
+// Test the image-specific printers of UR tracing.
 //
 // CHECK: ---> urMemImageCreate(
 // CHECK-SAME:   image_desc w/h/d : 4 / 4 / 1  --  arrSz/row/slice : 0 / 64 / 256  --  num_mip_lvls/num_smpls/image_type : 0 / 0 / 4337

sycl/test-e2e/USM/usm_pooling.cpp

@@ -88,11 +88,11 @@ int main(int argc, char *argv[]) {
   context C = Q.get_context();
 
   const char *devType = D.is_cpu() ? "CPU" : "GPU";
-  std::string pluginName =
+  std::string adapterName =
       D.get_platform().get_info<sycl::info::platform::name>();
   std::cout << "Running on device " << devType << " ("
-            << D.get_info<sycl::info::device::name>() << ") " << pluginName
-            << " plugin\n";
+            << D.get_info<sycl::info::device::name>() << ") " << adapterName
+            << " adapter\n";
 
   if (*argv[1] == 'h') {
     std::cerr << "Test zeMemAllocHost\n";