From 375829d1b1b47670097aece4831a8680bd6c229d Mon Sep 17 00:00:00 2001
From: JackAKirk <jack.kirk@codeplay.com>
Date: Tue, 5 Jul 2022 18:00:23 +0100
Subject: [PATCH 1/2] Remove exp builtins header includes

Signed-off-by: JackAKirk <jack.kirk@codeplay.com>
---
 SYCL/BFloat16/bfloat16_builtins.cpp          | 1 -
 SYCL/DeviceLib/built-ins/ext_native_math.cpp | 1 -
 SYCL/DeviceLib/built-ins/printf.cpp          | 1 -
 SYCL/ESIMD/printf.cpp                        | 1 -
 SYCL/Matrix/element_wise_wi_marray.cpp       | 1 -
 SYCL/Printf/char.cpp                         | 1 -
 SYCL/Printf/double.cpp                       | 1 -
 SYCL/Printf/int.cpp                          | 1 -
 SYCL/Printf/long.cpp                         | 1 -
 SYCL/Printf/mixed-address-space.cpp          | 1 -
 SYCL/Printf/percent-symbol.cpp               | 1 -
 11 files changed, 11 deletions(-)

diff --git a/SYCL/BFloat16/bfloat16_builtins.cpp b/SYCL/BFloat16/bfloat16_builtins.cpp
index 101d811666..9ccf988492 100644
--- a/SYCL/BFloat16/bfloat16_builtins.cpp
+++ b/SYCL/BFloat16/bfloat16_builtins.cpp
@@ -6,7 +6,6 @@
 //
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -Xsycl-target-backend --cuda-gpu-arch=sm_80
 // RUN: %t.out
-#include <sycl/ext/oneapi/experimental/builtins.hpp>
 #include <sycl/sycl.hpp>
 
 #include <cmath>
diff --git a/SYCL/DeviceLib/built-ins/ext_native_math.cpp b/SYCL/DeviceLib/built-ins/ext_native_math.cpp
index 083019362d..e28057d72b 100644
--- a/SYCL/DeviceLib/built-ins/ext_native_math.cpp
+++ b/SYCL/DeviceLib/built-ins/ext_native_math.cpp
@@ -8,7 +8,6 @@
 // test is compiled with the -fsycl-device-code-split flag
 
 #include <cassert>
-#include <sycl/ext/oneapi/experimental/builtins.hpp>
 #include <sycl/sycl.hpp>
 
 template <typename T> void assert_out_of_bound(T val, T lower, T upper) {
diff --git a/SYCL/DeviceLib/built-ins/printf.cpp b/SYCL/DeviceLib/built-ins/printf.cpp
index 9170494418..9225f581b1 100644
--- a/SYCL/DeviceLib/built-ins/printf.cpp
+++ b/SYCL/DeviceLib/built-ins/printf.cpp
@@ -7,7 +7,6 @@
 // RUN: %GPU_RUN_PLACEHOLDER %t.out %GPU_CHECK_PLACEHOLDER
 // RUN: %ACC_RUN_PLACEHOLDER %t.out %ACC_CHECK_PLACEHOLDER
 
-#include <sycl/ext/oneapi/experimental/builtins.hpp>
 #include <sycl/sycl.hpp>
 
 #include <cstdint>
diff --git a/SYCL/ESIMD/printf.cpp b/SYCL/ESIMD/printf.cpp
index b4133b84f2..2ca6df3e19 100644
--- a/SYCL/ESIMD/printf.cpp
+++ b/SYCL/ESIMD/printf.cpp
@@ -21,7 +21,6 @@
 #include "esimd_test_utils.hpp"
 
 #include <sycl/ext/intel/esimd.hpp>
-#include <sycl/ext/oneapi/experimental/builtins.hpp>
 #include <sycl/sycl.hpp>
 
 #include <cstdint>
diff --git a/SYCL/Matrix/element_wise_wi_marray.cpp b/SYCL/Matrix/element_wise_wi_marray.cpp
index e4188a567a..5b82ebf9db 100644
--- a/SYCL/Matrix/element_wise_wi_marray.cpp
+++ b/SYCL/Matrix/element_wise_wi_marray.cpp
@@ -10,7 +10,6 @@
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -Xsycl-target-backend --cuda-gpu-arch=sm_80 -DSYCL_EXT_ONEAPI_MATRIX=3 %s -o %t.out
 // RUN: %t.out
 
-#include <sycl/ext/oneapi/experimental/builtins.hpp>
 #include <sycl/sycl.hpp>
 
 using namespace sycl;
diff --git a/SYCL/Printf/char.cpp b/SYCL/Printf/char.cpp
index 6469ae25cf..86dc356402 100644
--- a/SYCL/Printf/char.cpp
+++ b/SYCL/Printf/char.cpp
@@ -25,7 +25,6 @@
 // CHECK: literal strings: s=Hello World!
 // CHECK_DISABLED: non-literal strings: s=Hello, World! ls=
 
-#include <sycl/ext/oneapi/experimental/builtins.hpp>
 #include <sycl/sycl.hpp>
 
 #include <cstring>
diff --git a/SYCL/Printf/double.cpp b/SYCL/Printf/double.cpp
index 11954860f7..2bdffac9d3 100644
--- a/SYCL/Printf/double.cpp
+++ b/SYCL/Printf/double.cpp
@@ -28,7 +28,6 @@
 
 #include <iostream>
 
-#include <sycl/ext/oneapi/experimental/builtins.hpp>
 #include <sycl/sycl.hpp>
 
 #include "helper.hpp"
diff --git a/SYCL/Printf/int.cpp b/SYCL/Printf/int.cpp
index 63c702dccc..d8f69db023 100644
--- a/SYCL/Printf/int.cpp
+++ b/SYCL/Printf/int.cpp
@@ -20,7 +20,6 @@
 // RUN: %GPU_RUN_PLACEHOLDER %t.constant.out %GPU_CHECK_PLACEHOLDER
 // RUN: %ACC_RUN_PLACEHOLDER %t.constant.out %ACC_CHECK_PLACEHOLDER
 
-#include <sycl/ext/oneapi/experimental/builtins.hpp>
 #include <sycl/sycl.hpp>
 
 #include "helper.hpp"
diff --git a/SYCL/Printf/long.cpp b/SYCL/Printf/long.cpp
index f518600b79..cbab7c0174 100644
--- a/SYCL/Printf/long.cpp
+++ b/SYCL/Printf/long.cpp
@@ -20,7 +20,6 @@
 // RUN: %GPU_RUN_PLACEHOLDER %t.constant.out %GPU_CHECK_PLACEHOLDER
 // RUN: %ACC_RUN_PLACEHOLDER %t.constant.out %ACC_CHECK_PLACEHOLDER
 
-#include <sycl/ext/oneapi/experimental/builtins.hpp>
 #include <sycl/sycl.hpp>
 
 #include "helper.hpp"
diff --git a/SYCL/Printf/mixed-address-space.cpp b/SYCL/Printf/mixed-address-space.cpp
index 430b0275de..c20b115a87 100644
--- a/SYCL/Printf/mixed-address-space.cpp
+++ b/SYCL/Printf/mixed-address-space.cpp
@@ -12,7 +12,6 @@
 // CHECK: Constant addrspace literal
 // CHECK: Generic addrspace literal
 
-#include <sycl/ext/oneapi/experimental/builtins.hpp>
 #include <sycl/sycl.hpp>
 
 #include "helper.hpp"
diff --git a/SYCL/Printf/percent-symbol.cpp b/SYCL/Printf/percent-symbol.cpp
index 8c4ec8e5aa..8753f26e1f 100644
--- a/SYCL/Printf/percent-symbol.cpp
+++ b/SYCL/Printf/percent-symbol.cpp
@@ -23,7 +23,6 @@
 // CHECK: %c %s %d %i %o %x %X %u
 // CHECK-NEXT: %f %F %e %E %a %A %g %G %n %p
 
-#include <sycl/ext/oneapi/experimental/builtins.hpp>
 #include <sycl/sycl.hpp>
 
 #include <cstring>

From a20d6d1b774d78ef332bc26e2673e9f6264b44f3 Mon Sep 17 00:00:00 2001
From: JackAKirk <jack.kirk@codeplay.com>
Date: Tue, 5 Jul 2022 18:12:15 +0100
Subject: [PATCH 2/2] Removed ext builtins.hpp include.

Signed-off-by: JackAKirk <jack.kirk@codeplay.com>
---
 SYCL/Printf/float.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/SYCL/Printf/float.cpp b/SYCL/Printf/float.cpp
index 7e95403c03..3c9411970b 100644
--- a/SYCL/Printf/float.cpp
+++ b/SYCL/Printf/float.cpp
@@ -31,7 +31,6 @@
 
 #include <iostream>
 
-#include <sycl/ext/oneapi/experimental/builtins.hpp>
 #include <sycl/sycl.hpp>
 
 #include "helper.hpp"