From d5961ecf51e8ac01a45f63cd79d3825ab7cfda91 Mon Sep 17 00:00:00 2001
From: Artur Gainullin <artur.gainullin@intel.com>
Date: Wed, 26 Jun 2019 12:34:36 -0700
Subject: [PATCH] [SYCL] Follow-up fixes for stream class

  * Enable constant propagation for stream manipulators
  * Enable LIT test on all devices except CPU
  * Remove unused builtins.hpp include

Signed-off-by: Artur Gainullin <artur.gainullin@intel.com>
---
 sycl/include/CL/sycl/detail/stream_impl.hpp |  1 -
 sycl/include/CL/sycl/stream.hpp             | 30 ++++++++++-----------
 sycl/test/basic_tests/stream.cpp            |  6 ++---
 3 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/sycl/include/CL/sycl/detail/stream_impl.hpp b/sycl/include/CL/sycl/detail/stream_impl.hpp
index eb6e25574d33e..5adabd4bed183 100644
--- a/sycl/include/CL/sycl/detail/stream_impl.hpp
+++ b/sycl/include/CL/sycl/detail/stream_impl.hpp
@@ -9,7 +9,6 @@
 #pragma once
 
 #include <CL/sycl/accessor.hpp>
-#include <CL/sycl/builtins.hpp>
 #include <CL/sycl/detail/array.hpp>
 #include <CL/sycl/device_selector.hpp>
 #include <CL/sycl/queue.hpp>
diff --git a/sycl/include/CL/sycl/stream.hpp b/sycl/include/CL/sycl/stream.hpp
index 1fcb1d0631c09..dd95e01204a69 100644
--- a/sycl/include/CL/sycl/stream.hpp
+++ b/sycl/include/CL/sycl/stream.hpp
@@ -28,29 +28,29 @@ enum class stream_manipulator {
   defaultfloat
 };
 
-const stream_manipulator dec = stream_manipulator::dec;
+constexpr stream_manipulator dec = stream_manipulator::dec;
 
-const stream_manipulator hex = stream_manipulator::hex;
+constexpr stream_manipulator hex = stream_manipulator::hex;
 
-const stream_manipulator oct = stream_manipulator::oct;
+constexpr stream_manipulator oct = stream_manipulator::oct;
 
-const stream_manipulator noshowbase = stream_manipulator::noshowbase;
+constexpr stream_manipulator noshowbase = stream_manipulator::noshowbase;
 
-const stream_manipulator showbase = stream_manipulator::showbase;
+constexpr stream_manipulator showbase = stream_manipulator::showbase;
 
-const stream_manipulator noshowpos = stream_manipulator::noshowpos;
+constexpr stream_manipulator noshowpos = stream_manipulator::noshowpos;
 
-const stream_manipulator showpos = stream_manipulator::showpos;
+constexpr stream_manipulator showpos = stream_manipulator::showpos;
 
-const stream_manipulator endl = stream_manipulator::endl;
+constexpr stream_manipulator endl = stream_manipulator::endl;
 
-const stream_manipulator fixed = stream_manipulator::fixed;
+constexpr stream_manipulator fixed = stream_manipulator::fixed;
 
-const stream_manipulator scientific = stream_manipulator::scientific;
+constexpr stream_manipulator scientific = stream_manipulator::scientific;
 
-const stream_manipulator hexfloat = stream_manipulator::hexfloat;
+constexpr stream_manipulator hexfloat = stream_manipulator::hexfloat;
 
-const stream_manipulator defaultfloat = stream_manipulator::defaultfloat;
+constexpr stream_manipulator defaultfloat = stream_manipulator::defaultfloat;
 
 class stream;
 
@@ -145,7 +145,7 @@ class stream {
   }
 
   // Set the flags which correspond to the input stream manipulator.
-  void set_manipulator(const stream_manipulator &SM) const {
+  void set_manipulator(const stream_manipulator SM) const {
     switch (SM) {
     case stream_manipulator::dec:
       set_flag(detail::Dec, detail::BaseField);
@@ -195,7 +195,7 @@ class stream {
   friend const stream &operator<<(const stream &, const float &);
   friend const stream &operator<<(const stream &, const double &);
   friend const stream &operator<<(const stream &, const half &);
-  friend const stream &operator<<(const stream &, const stream_manipulator &);
+  friend const stream &operator<<(const stream &, const stream_manipulator);
   friend const stream &operator<<(const stream &Out,
                                   const __precision_manipulator__ &RHS);
 
@@ -319,7 +319,7 @@ inline const stream &operator<<(const stream &Out,
 }
 
 inline const stream &operator<<(const stream &Out,
-                                const stream_manipulator &RHS) {
+                                const stream_manipulator RHS) {
   switch (RHS) {
   case stream_manipulator::endl:
     Out << '\n';
diff --git a/sycl/test/basic_tests/stream.cpp b/sycl/test/basic_tests/stream.cpp
index 61a41c71a3947..9d0ccdd0ec112 100644
--- a/sycl/test/basic_tests/stream.cpp
+++ b/sycl/test/basic_tests/stream.cpp
@@ -1,8 +1,8 @@
 // RUN: %clang -std=c++11 -fsycl -lstdc++ %s -o %t.out -lOpenCL -lsycl
-// TEMPORARY_DISABLED_RUNx: env SYCL_DEVICE_TYPE=HOST %t.out | FileCheck %s
+// RUN: env SYCL_DEVICE_TYPE=HOST %t.out | FileCheck %s
 // TEMPORARY_DISABLED_RUNx: %CPU_RUN_PLACEHOLDER %t.out %CPU_CHECK_PLACEHOLDER
-// TEMPORARY_DISABLED_RUNx: %GPU_RUN_PLACEHOLDER %t.out %GPU_CHECK_PLACEHOLDER
-// TEMPORARY_DISABLED_RUNx: %ACC_RUN_PLACEHOLDER %t.out %ACC_CHECK_PLACEHOLDER
+// RUN: %GPU_RUN_PLACEHOLDER %t.out %GPU_CHECK_PLACEHOLDER
+// RUN: %ACC_RUN_PLACEHOLDER %t.out %ACC_CHECK_PLACEHOLDER
 //==------------------ stream.cpp - SYCL stream basic test -----------------==//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.