Fix conflict

Signed-off-by: Jiang, Zhiwei <zhiwei.jiang@intel.com>

Author: zhiweij1

.github/CODEOWNERS

@@ -1,209 +1,2 @@
-<<<<<<< HEAD
 ##SYCLomatic
 clang/  @oneapi-src/syclomatic-reviewers
-=======
-* @bader
-
-# Front-end compiler
-clang/ @intel/dpcpp-cfe-reviewers
-
-# Clang driver
-clang/**/Driver/ @intel/dpcpp-clang-driver-reviewers
-
-# Clang tools
-clang-tools-extra/ @intel/dpcpp-cfe-reviewers
-
-# LLVM-SPIRV translator
-llvm-spirv/ @intel/dpcpp-spirv-reviewers
-
-# OpenCL deps
-opencl/ @intel/llvm-reviewers-runtime
-
-# OpenCL "offline" compiler
-opencl/opencl-aot/ @intel/dpcpp-tools-reviewers
-
-# libclc library
-libclc/ @intel/llvm-reviewers-cuda
-
-# Device library
-libdevice/ @intel/llvm-reviewers-runtime
-
-# DPC++ runtime library
-sycl/ @intel/llvm-reviewers-runtime
-
-# Documentation
-sycl/ReleaseNotes.md @intel/dpcpp-doc-reviewers @tfzhu
-sycl/doc/ @intel/dpcpp-doc-reviewers
-sycl/doc/design/ @intel/llvm-reviewers-runtime
-sycl/doc/design/spirv-extensions/ @intel/dpcpp-spirv-doc-reviewers
-sycl/doc/extensions/ @intel/dpcpp-specification-reviewers
-
-# Unified Runtime
-unified-runtime/ @intel/unified-runtime-reviewers
-# TODO: Use specific UR Level Zero adapter team
-unified-runtime/*/adapters/level_zero/ @intel/unified-runtime-reviewers
-# TODO: Use specific UR OpenCL adapter team
-unified-runtime/*/adapters/opencl/ @intel/unified-runtime-reviewers
-unified-runtime/*/adapters/cuda/  @intel/llvm-reviewers-cuda
-unified-runtime/*/adapters/hip/  @intel/llvm-reviewers-cuda
-unified-runtime/*/adapters/native_cpu/ @intel/dpcpp-nativecpu-reviewers
-unified-runtime/source/adapters/**/command_buffer.* @intel/sycl-graphs-reviewers
-unified-runtime/scripts/core/EXP-COMMAND-BUFFER.rst @intel/sycl-graphs-reviewers
-unified-runtime/scripts/core/exp-command-buffer.yml @intel/sycl-graphs-reviewers
-unified-runtime/test/conformance/exp_command_buffer** @intel/sycl-graphs-reviewers
-unified-runtime/source/adapters/**/image.* @intel/bindless-images-reviewers
-unified-runtime/scripts/core/EXP-BINDLESS-IMAGES.rst @intel/bindless-images-reviewers
-unified-runtime/scripts/core/exp-bindless-images.yml @intel/bindless-images-reviewers
-unified-runtime/test/conformance/exp_bindless_images** @intel/bindless-images-reviewers
-sycl/cmake/modules/FetchUnifiedRuntime.cmake @intel/unified-runtime-reviewers
-sycl/cmake/modules/UnifiedRuntimeTag.cmake @intel/unified-runtime-reviewers
-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/Adapters/ @intel/unified-runtime-reviewers
-
-# Win Proxy Loader
-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
-
-# CUDA and HIP device code tests
-sycl/test/check_device_code/cuda/ @intel/llvm-reviewers-cuda
-sycl/test/check_device_code/hip/ @intel/llvm-reviewers-cuda
-
-# XPTI instrumentation utilities
-xpti/ @intel/llvm-reviewers-runtime
-xptifw/ @intel/llvm-reviewers-runtime
-
-# DPC++ tools
-llvm/ @intel/dpcpp-tools-reviewers
-clang/lib/CodeGen/BackendUtil.cpp @intel/dpcpp-cfe-reviewers @intel/dpcpp-tools-reviewers
-clang/include/clang/CodeGen/BackendUtil.h @intel/dpcpp-cfe-reviewers @intel/dpcpp-tools-reviewers
-
-# OpenCL CPU RT
-opencl-cpu/ @intel/ocl-cpu-rt-write
-
-# SPMD transform passes on CPU
-llvm/lib/Transforms/SPMDTransforms/ @intel/ocl-cpu-rt-write
-
-# SPMD transform passes header files
-llvm/include/llvm/Transforms/SPMDTransforms/ @intel/ocl-cpu-rt-write
-
-# SPMD transform passes LIT test
-llvm/test/Transforms/SPMDTransforms/ @intel/ocl-cpu-rt-write
-
-# Clang offload tools
-clang/**/OffloadBundler.h @intel/dpcpp-tools-reviewers
-clang/**/OffloadBundler.cpp @intel/dpcpp-tools-reviewers
-clang/tools/clang-offload-*/ @intel/dpcpp-tools-reviewers
-clang/tools/clang-linker-wrapper/ @intel/dpcpp-tools-reviewers
-
-# Explicit SIMD
-ESIMD/ @intel/dpcpp-esimd-reviewers
-esimd/ @intel/dpcpp-esimd-reviewers
-sycl/include/sycl/ext/intel/esimd.hpp @intel/dpcpp-esimd-reviewers
-sycl/doc/extensions/**/sycl_ext_intel_esimd/ @intel/dpcpp-esimd-reviewers
-llvm/lib/SYCLLowerIR/CMakeLists.txt @intel/dpcpp-tools-reviewers @intel/dpcpp-esimd-reviewers
-sycl/test-e2e/ESIMD/ @intel/dpcpp-esimd-reviewers
-
-# invoke_simd
-sycl/include/sycl/ext/oneapi/experimental/invoke_simd.hpp @intel/dpcpp-esimd-reviewers @rolandschulz
-sycl/include/std/experimental/simd.hpp @intel/dpcpp-esimd-reviewers @rolandschulz
-llvm/lib/SYCLLowerIR/LowerInvokeSimd.cpp @intel/dpcpp-esimd-reviewers
-llvm/include/llvm/SYCLLowerIR/LowerInvokeSimd.h @intel/dpcpp-esimd-reviewers
-invoke_simd/ @intel/dpcpp-esimd-reviewers
-InvokeSimd/ @intel/dpcpp-esimd-reviewers
-sycl/test-e2e/InvokeSimd/ @intel/dpcpp-esimd-reviewers
-
-# DevOps configs
-.github/ @intel/dpcpp-devops-reviewers
-buildbot/ @intel/dpcpp-devops-reviewers
-devops/ @intel/dpcpp-devops-reviewers
-
-# dev-igc driver update
-devops/dependencies-igc-dev.json @intel/sycl-matrix-reviewers @intel/dpcpp-esimd-reviewers @intel/dpcpp-devops-reviewers
-
-# Kernel fusion JIT compiler
-sycl-jit/ @intel/dpcpp-kernel-fusion-reviewers
-sycl/doc/design/KernelFusionJIT.md @intel/dpcpp-kernel-fusion-reviewers
-sycl/doc/extensions/experimental/sycl_ext_codeplay_kernel_fusion.asciidoc @intel/dpcpp-kernel-fusion-reviewers
-sycl/include/sycl/ext/codeplay/experimental/fusion_properties.hpp  @intel/dpcpp-kernel-fusion-reviewers
-sycl/include/sycl/ext/codeplay/experimental/fusion_wrapper.hpp @intel/dpcpp-kernel-fusion-reviewers
-sycl/source/detail/fusion/ @intel/dpcpp-kernel-fusion-reviewers
-sycl/source/detail/jit_compiler.hpp @intel/dpcpp-kernel-fusion-reviewers
-sycl/source/detail/jit_compiler.cpp @intel/dpcpp-kernel-fusion-reviewers
-sycl/source/detail/jit_device_binaries.hpp @intel/dpcpp-kernel-fusion-reviewers
-sycl/source/detail/jit_device_binaries.cpp @intel/dpcpp-kernel-fusion-reviewers
-sycl/test-e2e/KernelFusion @intel/dpcpp-kernel-fusion-reviewers
-
-# Matrix
-sycl/include/sycl/ext/oneapi/matrix/ @intel/sycl-matrix-reviewers
-sycl/test-e2e/Matrix @intel/sycl-matrix-reviewers
-sycl/test/matrix @intel/sycl-matrix-reviewers
-sycl/test/check_device_code/matrix @intel/sycl-matrix-reviewers
-
-# Native CPU
-llvm/**/*SYCLNativeCPU* @intel/dpcpp-nativecpu-reviewers
-clang/include/clang/Basic/SYCLNativeCPUHelpers.h @intel/dpcpp-nativecpu-reviewers
-clang/test/CodeGenSYCL/native_cpu*.cpp @intel/dpcpp-nativecpu-reviewers
-clang/test/Driver/sycl-native-cpu*.cpp @intel/dpcpp-nativecpu-reviewers
-sycl/**/native_cpu/ @intel/dpcpp-nativecpu-reviewers
-sycl/doc/design/SYCLNativeCPU.md @intel/dpcpp-nativecpu-reviewers
-sycl/include/sycl/detail/native_cpu.hpp @intel/dpcpp-nativecpu-reviewers
-libdevice/nativecpu* @intel/dpcpp-nativecpu-reviewers
-
-# SYCL-Graphs extensions
-sycl/include/sycl/ext/oneapi/experimental/graph.hpp @intel/sycl-graphs-reviewers
-sycl/source/detail/graph_impl.cpp @intel/sycl-graphs-reviewers
-sycl/source/detail/graph_impl.hpp @intel/sycl-graphs-reviewers
-sycl/unittests/Extensions/CommandGraph/ @intel/sycl-graphs-reviewers
-sycl/test-e2e/Graph @intel/sycl-graphs-reviewers
-sycl/doc/design/CommandGraph.md @intel/sycl-graphs-reviewers
-sycl/doc/extensions/**/sycl_ext_oneapi_graph.asciidoc @intel/sycl-graphs-reviewers
-sycl/doc/syclgraph/ @intel/sycl-graphs-reviewers
-
-# syclcompat library
-sycl/**/syclcompat/ @intel/syclcompat-lib-reviewers
-sycl/cmake/modules/AddSYCLLibraryUnitTest.cmake @intel/syclcompat-lib-reviewers
-sycl/include/syclcompat.hpp @intel/syclcompat-lib-reviewers
-
-# bindless images
-sycl/doc/extensions/experimental/sycl_ext_oneapi_bindless_images.asciidoc @intel/bindless-images-reviewers
-sycl/include/sycl/ext/oneapi/bindless* @intel/bindless-images-reviewers
-sycl/source/detail/bindless* @intel/bindless-images-reviewers
-sycl/test/check_device_code/extensions/bindless_images.cpp @intel/bindless-images-reviewers
-sycl/test-e2e/bindless_images/ @intel/bindless-images-reviewers
-
-# Miscellaneous sycl e2e tests
-sycl/test-e2e/BFloat16/ @intel/dpcpp-tools-reviewers @intel/llvm-reviewers-runtime
-sycl/test-e2e/AOT/ @intel/dpcpp-tools-reviewers
-sycl/test-e2e/DeviceCodeSplit/ @intel/dpcpp-tools-reviewers
-sycl/test-e2e/SeparateCompile/ @intel/dpcpp-tools-reviewers
-sycl/test-e2e/Printf/ @intel/dpcpp-tools-reviewers @intel/llvm-reviewers-runtime
-sycl/test-e2e/SpecConstants/ @intel/dpcpp-tools-reviewers
-sycl/test-e2e/NewOffloadDriver/ @intel/dpcpp-tools-reviewers
-sycl/test-e2e/LLVMIntrinsicLowering/ @intel/dpcpp-spirv-reviewers
-
-# Sanitizer
-clang/lib/Driver/SanitizerArgs.cpp @intel/dpcpp-sanitizers-review
-libdevice/include/asan_rtl.hpp @intel/dpcpp-sanitizers-review
-libdevice/include/msan_rtl.hpp @intel/dpcpp-sanitizers-review
-libdevice/include/sanitizer_defs.hpp @intel/dpcpp-sanitizers-review
-libdevice/sanitizer/ @intel/dpcpp-sanitizers-review
-llvm/include/llvm/Transforms/Instrumentation/AddressSanitizer.h @intel/dpcpp-sanitizers-review
-llvm/include/llvm/Transforms/Instrumentation/AddressSanitizerCommon.h @intel/dpcpp-sanitizers-review
-llvm/include/llvm/Transforms/Instrumentation/AddressSanitizerOptions.h @intel/dpcpp-sanitizers-review
-llvm/include/llvm/Transforms/Instrumentation/MemorySanitizer.h @intel/dpcpp-sanitizers-review
-llvm/include/llvm/Transforms/Instrumentation/ThreadSanitizer.h @intel/dpcpp-sanitizers-review
-llvm/lib/Transforms/Instrumentation/AddressSanitizer.cpp @intel/dpcpp-sanitizers-review
-llvm/lib/Transforms/Instrumentation/MemorySanitizer.cpp @intel/dpcpp-sanitizers-review
-llvm/lib/Transforms/Instrumentation/ThreadSanitizer.cpp @intel/dpcpp-sanitizers-review
-llvm/test/Instrumentation/AddressSanitizer/ @intel/dpcpp-sanitizers-review
-llvm/test/Instrumentation/MemorySanitizer/ @intel/dpcpp-sanitizers-review
-llvm/test/Instrumentation/ThreadSanitizer/ @intel/dpcpp-sanitizers-review
-sycl/test-e2e/AddressSanitizer/ @intel/dpcpp-sanitizers-review
-sycl/test-e2e/MemorySanitizer/ @intel/dpcpp-sanitizers-review
->>>>>>> origin/sycl