Removed unnecessary comments

Author: raaiq1

sycl/include/CL/sycl/backend_types.hpp

@@ -10,9 +10,6 @@
 
 #include <CL/sycl/detail/defines.hpp>
 
-// #include <fstream>
-// #include <iostream>
-// #include <istream>
 #include <string>
 
 __SYCL_INLINE_NAMESPACE(cl) {
@@ -70,31 +67,7 @@ inline std::string backend_to_string(const backend& be) {
   }
   return Out;
 }
-// inline std::ostream &operator<<(std::ostream &Out, backend be) {
-//   switch (be) {
-//   case backend::host:
-//     Out << "host";
-//     break;
-//   case backend::opencl:
-//     Out << "opencl";
-//     break;
-//   case backend::ext_oneapi_level_zero:
-//     Out << "ext_oneapi_level_zero";
-//     break;
-//   case backend::ext_oneapi_cuda:
-//     Out << "ext_oneapi_cuda";
-//     break;
-//   case backend::ext_intel_esimd_emulator:
-//     Out << "ext_intel_esimd_emulator";
-//     break;
-//   case backend::ext_oneapi_hip:
-//     Out << "ext_oneapi_hip";
-//     break;
-//   case backend::all:
-//     Out << "all";
-//   }
-//   return Out;
-// }
+
 
 } // namespace sycl
 } // __SYCL_INLINE_NAMESPACE(cl)

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

@@ -116,6 +116,7 @@ static inline std::string codeToString(cl_int code) {
                           "Native API returns: "
 
 #ifndef __SYCL_SUPPRESS_OCL_ERROR_REPORT
+#include <cstdio>
 // TODO: rename all names with direct use of OCL/OPENCL to be backend agnostic.
 #define __SYCL_REPORT_OCL_ERR_TO_STREAM(expr)                                  \
   {                                                                            \

sycl/include/CL/sycl/detail/device_filter.hpp

@@ -7,14 +7,13 @@
 //===----------------------------------------------------------------------===//
 
 
-//Todo: Have iostream replacements
+
 #pragma once
 
 #include <CL/sycl/backend_types.hpp>
 #include <CL/sycl/detail/defines.hpp>
 #include <CL/sycl/info/info_desc.hpp>
 
-//#include <iostream>
 #include <string>
 
 __SYCL_INLINE_NAMESPACE(cl) {
@@ -32,8 +31,6 @@ struct device_filter {
 
   device_filter(){};
   device_filter(const std::string &FilterString);
-  // friend std::ostream &operator<<(std::ostream &Out,
-  //                                 const device_filter &Filter);
   inline operator std::string()const;
 
 };
@@ -51,8 +48,6 @@ class device_filter_list {
   bool deviceTypeCompatible(info::device_type DeviceType);
   bool deviceNumberCompatible(int DeviceNum);
   bool containsHost();
-  // friend std::ostream &operator<<(std::ostream &Out,
-  //                                 const device_filter_list &List);
   inline operator std::string()const;
 };
 
@@ -80,27 +75,6 @@ inline device_filter::operator std::string() const {
    return Out;
 }
 
-// inline std::ostream &operator<<(std::ostream &Out,
-//                                 const device_filter &Filter) {
-//   Out << Filter.Backend << ":";
-//   if (Filter.DeviceType == info::device_type::host) {
-//     Out << "host";
-//   } else if (Filter.DeviceType == info::device_type::cpu) {
-//     Out << "cpu";
-//   } else if (Filter.DeviceType == info::device_type::gpu) {
-//     Out << "gpu";
-//   } else if (Filter.DeviceType == info::device_type::accelerator) {
-//     Out << "accelerator";
-//   } else if (Filter.DeviceType == info::device_type::all) {
-//     Out << "*";
-//   } else {
-//     Out << "unknown";
-//   }
-//   if (Filter.HasDeviceNum) {
-//     Out << ":" << Filter.DeviceNum;
-//   }
-//   return Out;
-// }
 
 inline device_filter_list::operator std::string()const{
     std::string Out;
@@ -111,15 +85,6 @@ inline device_filter_list::operator std::string()const{
   return Out;
 }
 
-// inline std::ostream &operator<<(std::ostream &Out,
-//                                 const device_filter_list &List) {
-//   for (const device_filter &Filter : List.FilterList) {
-//     Out << Filter;
-//     Out << ",";
-//   }
-//   return Out;
-// }
-
 } // namespace detail
 } // namespace sycl
 } // __SYCL_INLINE_NAMESPACE(cl)

sycl/include/CL/sycl/detail/image_accessor_util.hpp

@@ -20,7 +20,6 @@
 #include <CL/sycl/types.hpp>
 
 #include <cmath>
-//#include <iostream>
 
 __SYCL_INLINE_NAMESPACE(cl) {
 namespace sycl {

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

@@ -238,12 +238,9 @@ class DeviceBinaryProperty {
   operator std::string()const;
 
 protected:
-  // friend std::ostream &operator<<(std::ostream &Out,
-  //                                 const DeviceBinaryProperty &P);
   const _pi_device_binary_property_struct *Prop;
 };
 
-//std::ostream &operator<<(std::ostream &Out, const DeviceBinaryProperty &P);
 
 // C++ convenience wrapper over the pi_device_binary_struct structure.
 class DeviceBinaryImage {

sycl/include/CL/sycl/half_type.hpp

@@ -13,7 +13,6 @@
 #include <CL/sycl/detail/type_traits.hpp>
 
 #include <functional>
-// #include <iostream>
 #include <limits>
 
 #if !__has_builtin(__builtin_expect)
@@ -586,20 +585,7 @@ class half {
     return static_cast<float>(Data);
   }
 
-  // Operator << and >>
-  // inline friend std::ostream &operator<<(std::ostream &O,
-  //                                        cl::sycl::half const &rhs) {
-  //   O << static_cast<float>(rhs);
-  //   return O;
-  // }
-
-  // inline friend std::istream &operator>>(std::istream &I, cl::sycl::half &rhs) {
-  //   float ValFloat = 0.0f;
-  //   I >> ValFloat;
-  //   rhs = ValFloat;
-  //   return I;
-  // }
-
+  
   template <typename Key> friend struct std::hash;
 
   friend class sycl::ext::intel::esimd::detail::WrapperElementTypeProxy;
@@ -714,23 +700,13 @@ inline FILE* operator<<(FILE* file,cl::sycl::half const &rhs){
   return file;
 }
 
-// inline std::ostream &operator<<(std::ostream &O, cl::sycl::half const &rhs) {
-//   O << static_cast<float>(rhs);
-//   return O;
-// }
 
 inline FILE* operator>>(FILE* file,cl::sycl::half &rhs){
   float ValFloat = 0.0f;
   fscanf(file,"%f",&ValFloat);
   rhs=ValFloat;
   return file;
 }
-// inline std::istream &operator>>(std::istream &I, cl::sycl::half &rhs) {
-//   float ValFloat = 0.0f;
-//   I >> ValFloat;
-//   rhs = ValFloat;
-//   return I;
-// }
 
 #undef __SYCL_CONSTEXPR_HALF
 #undef _CPP14_CONSTEXPR

sycl/include/sycl/ext/intel/esimd/detail/elem_type_traits.hpp

@@ -713,20 +713,6 @@ __esimd_wrapper_type_bitcast_from<sycl::half>(sycl::half Val) {
 template <>
 struct is_esimd_arithmetic_type<__raw_t<sycl::half>, void> : std::true_type {};
 
-// Misc
-//TODO: Delete definitions duplicate from half_type.hpp
-// inline std::ostream &operator<<(std::ostream &O, sycl::half const &rhs) {
-//   O << static_cast<float>(rhs);
-//   return O;
-// }
-
-// inline std::istream &operator>>(std::istream &I, sycl::half &rhs) {
-//   float ValFloat = 0.0f;
-//   I >> ValFloat;
-//   rhs = ValFloat;
-//   return I;
-// }
-
 // The only other place which needs to be updated to support a new type is
 // the is_wrapper_elem_type_v meta function.
 

sycl/include/sycl/ext/intel/esimd/simd.hpp

@@ -22,7 +22,7 @@
 #include <sycl/ext/oneapi/experimental/invoke_simd.hpp>
 
 #ifndef __SYCL_DEVICE_ONLY__
-//#include <iostream>
+#include <cstdio>
 #endif // __SYCL_DEVICE_ONLY__
 
 __SYCL_INLINE_NAMESPACE(cl) {
@@ -219,24 +219,4 @@ template <int N> using simd_mask = detail::simd_mask_type<N>;
 /// @} sycl_esimd_core_vectors
 
 } // namespace __ESIMD_NS
-} // __SYCL_INLINE_NAMESPACE(cl)
-
-/// @ingroup sycl_esimd_misc
-/// Prints a \c simd object to an output stream.
-/// TODO: implemented for host code only.
-// template <typename Ty, int N>
-// std::ostream &operator<<(std::ostream &OS, const __ESIMD_NS::simd<Ty, N> &V)
-// #ifdef __SYCL_DEVICE_ONLY__
-//     {}
-// #else
-// {
-//   OS << "{";
-//   for (int I = 0; I < N; I++) {
-//     OS << V[I];
-//     if (I < N - 1)
-//       OS << ",";
-//   }
-//   OS << "}";
-//   return OS;
-// }
-// #endif // __SYCL_DEVICE_ONLY__
+} // __SYCL_INLINE_NAMESPACE(cl)

sycl/plugins/esimd_emulator/pi_esimd_emulator.hpp

@@ -17,7 +17,6 @@
 #include <CL/sycl/detail/pi.h>
 #include <atomic>
 #include <cassert>
-//#include <iostream>
 #include <mutex>
 #include <unordered_map>
 

sycl/plugins/level_zero/pi_level_zero.hpp

@@ -30,7 +30,6 @@
 #include <cassert>
 #include <cstring>
 #include <functional>
-//#include <iostream>
 #include <list>
 #include <map>
 #include <memory>

sycl/plugins/level_zero/tracing.cpp

@@ -70,7 +70,8 @@ void enableZeTracing() {
   Status = zelTracerCreate(&TracerDesc, &Tracer);
 
   if (Status != ZE_RESULT_SUCCESS || Tracer == nullptr) {
-    fprintf(stderr,"[WARNING] Failed to create Level Zero tracer: %d\n",Status);
+    fprintf(stderr,"[WARNING] Failed to create Level Zero tracer: %d\n",
+            Status);
     return;
   }
 

sycl/plugins/level_zero/usm_allocator.cpp

@@ -586,12 +586,6 @@ bool operator==(const Slab &Lhs, const Slab &Rhs) {
   return Lhs.getPtr() == Rhs.getPtr();
 }
 
-// std::ostream &operator<<(std::ostream &Os, const Slab &Slab) {
-//   Os << "Slab<" << Slab.getPtr() << ", " << Slab.getEnd() << ", "
-//      << Slab.getBucket().getSize() << ">";
-//   return Os;
-// }
-
 Slab::Slab(Bucket &Bkt)
     : // In case bucket size is not a multiple of SlabMinSize, we would have
       // some padding at the end of the slab.

sycl/source/detail/plugin.hpp

@@ -120,8 +120,8 @@ class plugin {
 
       // If the warning level is greater then 2 emit the message
       if (detail::SYCLConfig<detail::SYCL_RT_WARNING_LEVEL>::get() >= 2)
-        //TODO: Implement clog replacment, stderr is not fully analogous
-        fprintf(stderr,"%s\n",message);
+        //TODO: Current solution is a proper analog ogf clog
+        fprintf(stdout,"%s\n",message);
 
       // If it is a warning do not throw code
       if (pi_result == PI_SUCCESS)
@@ -138,7 +138,8 @@ class plugin {
 
       // If the warning level is greater then 2 emit the message
       if (detail::SYCLConfig<detail::SYCL_RT_WARNING_LEVEL>::get() >= 2)
-        fprintf(stderr, "%s\n",message);
+        //TODO: Current solution is a proper analog ogf clog
+        fprintf(stdout, "%s\n",message);
 
       // If it is a warning do not throw code
       if (pi_result == PI_SUCCESS)

sycl/source/detail/program_impl.hpp

@@ -20,7 +20,6 @@
 
 #include <algorithm>
 #include <cassert>
-//#include <fstream>
 #include <memory>
 #include <mutex>
 

sycl/source/detail/program_manager/program_manager.cpp

@@ -485,8 +485,8 @@ static void emitBuiltProgramInfo(const pi_program &Prog,
   if (SYCLConfig<SYCL_RT_WARNING_LEVEL>::get() >= 2) {
     std::string ProgramBuildLog =
         ProgramManager::getProgramBuildLog(Prog, Context);
-        //TODO: Implement clog replacment, stderr is not fully analogous
-    fprintf(stderr,"%s\n",ProgramBuildLog.c_str());
+        //TODO: Implement clog replacment, stdout is not fully analogous
+    fprintf(stdout,"%s\n",ProgramBuildLog.c_str());
   }
 }
 

sycl/source/detail/spec_constant_impl.cpp

@@ -15,7 +15,6 @@
 
 #include <cstring>
 #include <cstdio>
-//#include <iostream>
 
 __SYCL_INLINE_NAMESPACE(cl) {
 namespace sycl {
@@ -52,17 +51,6 @@ spec_constant_impl::operator std::string() const{
   Out += "]";
   return Out;
 }
-// std::ostream &operator<<(std::ostream &Out, const spec_constant_impl &V) {
-//   Out << "spec_constant_impl"
-//       << " { Size=" << V.getSize() << " IsSet=" << V.isSet() << " Val=[";
-//   std::ios_base::fmtflags FlagsSav = Out.flags();
-//   Out << std::hex;
-//   for (unsigned I = 0; I < V.getSize(); ++I) {
-//     Out << (I == 0 ? "" : " ") << static_cast<int>(*(V.getValuePtr() + I));
-//   }
-//   Out << "]" << FlagsSav;
-//   return Out;
-// }
 
 } // namespace detail
 } // namespace sycl

sycl/source/detail/spec_constant_impl.hpp

@@ -12,7 +12,6 @@
 #include <CL/sycl/detail/util.hpp>
 #include <CL/sycl/stl.hpp>
 
-//#include <iostream>
 #include <map>
 #include <vector>
 
@@ -38,7 +37,6 @@ class spec_constant_impl {
   std::vector<char> Bytes;
 };
 
-// std::ostream &operator<<(std::ostream &Out, const spec_constant_impl &V);
 
 // Used to define specialization constant registry. Must be ordered map, since
 // the order of entries matters in stableSerializeSpecConstRegistry.