From 048b9cfadbf170bd86009d6ec312c0dfdb5da7f2 Mon Sep 17 00:00:00 2001
From: JackAKirk <jack.kirk@codeplay.com>
Date: Fri, 1 Jul 2022 12:01:51 +0100
Subject: [PATCH 1/3] Remove experimental/builtins.hpp from sycl.hpp.

Signed-off-by: JackAKirk <jack.kirk@codeplay.com>
---
 sycl/include/CL/sycl.hpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/sycl/include/CL/sycl.hpp b/sycl/include/CL/sycl.hpp
index 9b517ced4b659..10dcf00b94d22 100644
--- a/sycl/include/CL/sycl.hpp
+++ b/sycl/include/CL/sycl.hpp
@@ -61,7 +61,6 @@
 #include <sycl/ext/oneapi/backend/level_zero.hpp>
 #endif
 #include <sycl/ext/oneapi/device_global/properties.hpp>
-#include <sycl/ext/oneapi/experimental/builtins.hpp>
 #include <sycl/ext/oneapi/experimental/cuda/barrier.hpp>
 #include <sycl/ext/oneapi/filter_selector.hpp>
 #include <sycl/ext/oneapi/group_algorithm.hpp>

From 69a0eceb6e0fb2045d8d6833400fedbf829c8e03 Mon Sep 17 00:00:00 2001
From: JackAKirk <jack.kirk@codeplay.com>
Date: Fri, 1 Jul 2022 12:52:20 +0100
Subject: [PATCH 2/3] Add header to test.

Signed-off-by: JackAKirk <jack.kirk@codeplay.com>
---
 sycl/test/extensions/experimental-printf.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sycl/test/extensions/experimental-printf.cpp b/sycl/test/extensions/experimental-printf.cpp
index 652b94c2a06e9..d64e78ee4883e 100644
--- a/sycl/test/extensions/experimental-printf.cpp
+++ b/sycl/test/extensions/experimental-printf.cpp
@@ -16,7 +16,8 @@
 // CHECK: Constant [[#TYPE]] [[#CONST:]]
 // CHECK: ExtInst [[#]] [[#]] [[#]] printf [[#]] [[#CONST]]
 
-#include <CL/sycl.hpp>
+#include <sycl/ext/oneapi/experimental/builtins.hpp>
+#include <sycl/sycl.hpp>
 
 #ifdef __SYCL_DEVICE_ONLY__
 #define __SYCL_CONSTANT_AS __attribute__((opencl_constant))

From 3e1461afd22e79af8c0e1681f5ecccc2c245c696 Mon Sep 17 00:00:00 2001
From: JackAKirk <jack.kirk@codeplay.com>
Date: Fri, 1 Jul 2022 13:26:43 +0100
Subject: [PATCH 3/3] Add missing header to test.

Signed-off-by: JackAKirk <jack.kirk@codeplay.com>
---
 sycl/test/basic_tests/built-ins.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sycl/test/basic_tests/built-ins.cpp b/sycl/test/basic_tests/built-ins.cpp
index 05f0e94e4042c..720313c2c5ade 100644
--- a/sycl/test/basic_tests/built-ins.cpp
+++ b/sycl/test/basic_tests/built-ins.cpp
@@ -7,7 +7,8 @@
 // Hits an assertion with AMD:
 // XFAIL: hip_amd
 
-#include <CL/sycl.hpp>
+#include <sycl/ext/oneapi/experimental/builtins.hpp>
+#include <sycl/sycl.hpp>
 
 #include <cassert>