Merge from 'sycl' to 'sycl-web'

Author: iclsrc

clang/lib/Driver/ToolChains/HIP.cpp

@@ -250,8 +250,6 @@ void HIPToolChain::addClangTargetOptions(
           DeviceOffloadingKind == Action::OFK_SYCL) &&
          "Only HIP and SYCL offloading kinds are supported for GPUs.");
 
-  StringRef GpuArch = getGPUArch(DriverArgs);
-
   CC1Args.push_back("-fcuda-is-device");
 
   if (DriverArgs.hasFlag(options::OPT_fcuda_approx_transcendentals,

sycl/doc/extensions/ExplicitSIMD/dpcpp-explicit-simd.md

@@ -357,13 +357,13 @@ template <typename T, int n, ChannelMaskType Mask,
           CacheHint L3H = CacheHint::Default>
     typename std::enable_if<(n == 16 || n == 32),
                             simd<T, n * NumChannels(Mask)>>::type
-    flat_load4(T *p, simd<uint32_t, n> offsets, simd<uint16_t, n> pred = 1);
+    gather_rgba(T *p, simd<uint32_t, n> offsets, simd<uint16_t, n> pred = 1);
 
 template <typename T, int n, ChannelMaskType Mask,
           CacheHint L1H = CacheHint::Default,
           CacheHint L3H = CacheHint::Default>
 typename std::enable_if<(n == 16 || n == 32), void>::type
-    flat_store4(T *p, simd<T, n * NumChannels(Mask)> vals,
+    scatter_rgba(T *p, simd<T, n * NumChannels(Mask)> vals,
             simd<uint32_t, n> offsets, simd<uint16_t, n> pred = 1);
 ```
 

sycl/include/CL/sycl/detail/common.hpp

@@ -31,9 +31,6 @@ namespace detail {
 constexpr const char *SYCL_STREAM_NAME = "sycl";
 // Stream name being used for traces generated from the SYCL plugin layer
 constexpr const char *SYCL_PICALL_STREAM_NAME = "sycl.pi";
-// Stream name being used for traces generated from PI calls. This stream
-// contains information about function arguments.
-constexpr const char *SYCL_PIDEBUGCALL_STREAM_NAME = "sycl.pi.debug";
 // Data structure that captures the user code location information using the
 // builtin capabilities of the compiler
 struct code_location {

sycl/include/CL/sycl/detail/pi.def

@@ -14,10 +14,6 @@
 // This is for convinience of doing same thing for all interfaces, e.g.
 // declare, define, initialize.
 //
-// This list is used to define PiApiKind enum, which is part of external
-// interface. To avoid ABI breakage, please, add new entries to the end of the
-// list.
-//
 // Platform
 _PI_API(piPlatformsGet)
 _PI_API(piPlatformGetInfo)

sycl/include/CL/sycl/detail/pi.hpp

@@ -184,26 +184,6 @@ uint64_t emitFunctionBeginTrace(const char *FName);
 /// \param FName The name of the PI API call
 void emitFunctionEndTrace(uint64_t CorrelationID, const char *FName);
 
-/// Notifies XPTI subscribers about PI function calls and packs call arguments.
-///
-/// \param FuncID is the API hash ID from PiApiID type trait.
-/// \param FName The name of the PI API call.
-/// \param ArgsData is a pointer to packed function call arguments.
-uint64_t emitFunctionWithArgsBeginTrace(uint32_t FuncID, const char *FName,
-                                        unsigned char *ArgsData);
-
-/// Notifies XPTI subscribers about PI function call result.
-///
-/// \param CorrelationID The correlation ID for the API call generated by the
-/// emitFunctionWithArgsBeginTrace() call.
-/// \param FuncID is the API hash ID from PiApiID type trait.
-/// \param FName The name of the PI API call.
-/// \param ArgsData is a pointer to packed function call arguments.
-/// \param Result is function call result value.
-void emitFunctionWithArgsEndTrace(uint64_t CorrelationID, uint32_t FuncID,
-                                  const char *FName, unsigned char *ArgsData,
-                                  pi_result Result);
-
 // A wrapper for passing around byte array properties
 class ByteArray {
 public:
@@ -415,5 +395,3 @@ namespace RT = cl::sycl::detail::pi;
 
 } // namespace sycl
 } // __SYCL_INLINE_NAMESPACE(cl)
-
-#undef _PI_API

sycl/include/CL/sycl/detail/type_traits.hpp

@@ -14,7 +14,6 @@
 #include <CL/sycl/detail/type_list.hpp>
 
 #include <array>
-#include <tuple>
 #include <type_traits>
 
 __SYCL_INLINE_NAMESPACE(cl) {
@@ -351,12 +350,6 @@ template <access::address_space AS, class DataT>
 using const_if_const_AS = DataT;
 #endif
 
-template <typename T> struct function_traits {};
-
-template <typename Ret, typename... Args> struct function_traits<Ret(Args...)> {
-  using ret_type = Ret;
-  using args_type = std::tuple<Args...>;
-};
 
 } // namespace detail
 } // namespace sycl