Revert "[SYCL][FPGA] Implement task_sequence header, properties, and add new fpga_cluster kernel property (#12453)"

This reverts commit 7b9001e.

Author: aejjehint

clang/lib/CodeGen/CodeGenTypes.cpp

@@ -706,11 +706,6 @@ llvm::Type *CodeGenTypes::ConvertType(QualType T) {
                              "__spv::__spirv_CooperativeMatrixKHR") {
           ResultType = ConvertSPVCooperativeMatrixType(RD);
           break;
-        } else if (RD && RD->getQualifiedNameAsString() ==
-                             "__spv::__spirv_TaskSequenceINTEL") {
-          ResultType = llvm::TargetExtType::get(getLLVMContext(),
-                                                "spirv.TaskSequenceINTEL");
-          break;
         }
       }
     }

clang/lib/Driver/ToolChains/Clang.cpp

@@ -10511,7 +10511,7 @@ static void getTripleBasedSPIRVTransOpts(Compilation &C,
   std::string DefaultExtArg =
       ",+SPV_EXT_shader_atomic_float_add,+SPV_EXT_shader_atomic_float_min_max"
       ",+SPV_KHR_no_integer_wrap_decoration,+SPV_KHR_float_controls"
-      ",+SPV_KHR_expect_assume,+SPV_KHR_linkonce_odr";
+      ",+SPV_KHR_expect_assume,+SPV_KHR_linkonce_odr,+SPV_KHR_bit_instructions";
   std::string INTELExtArg =
       ",+SPV_INTEL_subgroups,+SPV_INTEL_media_block_io"
       ",+SPV_INTEL_device_side_avc_motion_estimation"
@@ -10533,7 +10533,6 @@ static void getTripleBasedSPIRVTransOpts(Compilation &C,
       ",+SPV_INTEL_fpga_argument_interfaces"
       ",+SPV_INTEL_fpga_invocation_pipelining_attributes"
       ",+SPV_INTEL_fpga_latency_control"
-      ",+SPV_INTEL_task_sequence"
       ",+SPV_KHR_shader_clock"
       ",+SPV_INTEL_bindless_images";
   ExtArg = ExtArg + DefaultExtArg + INTELExtArg;

clang/test/CodeGenSYCL/intel-task-sequence.cpp

@@ -47,7 +47,6 @@
 // CHECK-DEFAULT-SAME:,+SPV_INTEL_fpga_argument_interfaces
 // CHECK-DEFAULT-SAME:,+SPV_INTEL_fpga_invocation_pipelining_attributes
 // CHECK-DEFAULT-SAME:,+SPV_INTEL_fpga_latency_control
-// CHECK-DEFAULT-SAME:,+SPV_INTEL_task_sequence
 // CHECK-DEFAULT-SAME:,+SPV_KHR_shader_clock
 // CHECK-DEFAULT-SAME:,+SPV_INTEL_bindless_images
 // CHECK-DEFAULT-SAME:,+SPV_INTEL_token_type
@@ -82,7 +81,6 @@
 // CHECK-FPGA-HW-SAME:,+SPV_INTEL_fpga_buffer_location
 // CHECK-FPGA-HW-SAME:,+SPV_INTEL_fpga_argument_interfaces
 // CHECK-FPGA-HW-SAME:,+SPV_INTEL_fpga_latency_control
-// CHECK-FPGA-HW-SAME:,+SPV_INTEL_task_sequence
 // CHECK-FPGA-HW-SAME:,+SPV_INTEL_usm_storage_classes
 // CHECK-FPGA-HW-SAME:,+SPV_INTEL_runtime_aligned
 // CHECK-FPGA-HW-SAME:,+SPV_INTEL_fpga_cluster_attributes,+SPV_INTEL_loop_fuse
@@ -114,7 +112,6 @@
 // CHECK-CPU-SAME:,+SPV_INTEL_fpga_argument_interfaces
 // CHECK-CPU-SAME:,+SPV_INTEL_fpga_invocation_pipelining_attributes
 // CHECK-CPU-SAME:,+SPV_INTEL_fpga_latency_control
-// CHECK-CPU-SAME:,+SPV_INTEL_task_sequence
 // CHECK-CPU-SAME:,+SPV_INTEL_token_type
 // CHECK-CPU-SAME:,+SPV_INTEL_bfloat16_conversion
 // CHECK-CPU-SAME:,+SPV_INTEL_joint_matrix

clang/test/Driver/sycl-spirv-ext.c

@@ -78,7 +78,6 @@ def AspectExt_intel_matrix : Aspect<"ext_intel_matrix">;
 def AspectExt_oneapi_is_composite : Aspect<"ext_oneapi_is_composite">;
 def AspectExt_oneapi_is_component : Aspect<"ext_oneapi_is_component">;
 def AspectExt_oneapi_graph : Aspect<"ext_oneapi_graph">;
-def AspectExt_intel_fpga_task_sequence : Aspect<"ext_intel_fpga_task_sequence">;
 def AspectExt_oneapi_limited_graph : Aspect<"ext_oneapi_limited_graph">;
 def AspectExt_oneapi_private_alloca : Aspect<"ext_oneapi_private_alloca">;
 def AspectExt_oneapi_queue_profiling_tag : Aspect<"ext_oneapi_queue_profiling_tag">;
@@ -137,8 +136,7 @@ def : TargetInfo<"__TestAspectList",
     AspectExt_oneapi_bindless_sampled_image_fetch_3d_usm, AspectExt_oneapi_bindless_sampled_image_fetch_3d,
     AspectExt_intel_esimd,
     AspectExt_oneapi_ballot_group, AspectExt_oneapi_fixed_size_group, AspectExt_oneapi_opportunistic_group,
-    AspectExt_oneapi_tangle_group, AspectExt_intel_matrix, AspectExt_oneapi_is_composite, AspectExt_oneapi_is_component,
-    AspectExt_oneapi_graph, AspectExt_intel_fpga_task_sequence, AspectExt_oneapi_limited_graph,
+    AspectExt_oneapi_tangle_group, AspectExt_intel_matrix, AspectExt_oneapi_is_composite, AspectExt_oneapi_is_component, AspectExt_oneapi_graph, AspectExt_oneapi_limited_graph,
     AspectExt_oneapi_private_alloca, AspectExt_oneapi_queue_profiling_tag],
     []>;
 // This definition serves the only purpose of testing whether the deprecated aspect list defined in here and in SYCL RT

llvm/include/llvm/SYCLLowerIR/DeviceConfigFile.td

@@ -416,7 +416,6 @@ attributeToExecModeMetadata(const Attribute &Attr, Function &F) {
 
   if (AttrKindStr == "sycl-streaming-interface") {
     // generate either:
-    //   !ip_interface !N
     //   !N = !{!"streaming"} or
     //   !N = !{!"streaming", !"stall_free_return"}
     SmallVector<Metadata *, 2> MD;
@@ -429,7 +428,6 @@ attributeToExecModeMetadata(const Attribute &Attr, Function &F) {
 
   if (AttrKindStr == "sycl-register-map-interface") {
     // generate either:
-    //   !ip_interface !N
     //   !N = !{!"csr"} or
     //   !N = !{!"csr", !"wait_for_done_write"}
     SmallVector<Metadata *, 2> MD;
@@ -440,20 +438,6 @@ attributeToExecModeMetadata(const Attribute &Attr, Function &F) {
                                             MDNode::get(Ctx, MD));
   }
 
-  if (AttrKindStr == "sycl-fpga-cluster") {
-    // generate either:
-    //   !stall_free !N
-    //   !N = !{i32 1} or
-    //   !stall_enable !N
-    //   !N = !{i32 1}
-    std::string ClusterType =
-        getAttributeAsInteger<uint32_t>(Attr) ? "stall_enable" : "stall_free";
-    Metadata *ClusterMDArgs[] = {
-        ConstantAsMetadata::get(ConstantInt::get(Type::getInt32Ty(Ctx), 1))};
-    return std::pair<std::string, MDNode *>(ClusterType,
-                                            MDNode::get(Ctx, ClusterMDArgs));
-  }
-
   if ((AttrKindStr == SYCL_REGISTER_ALLOC_MODE_ATTR ||
        AttrKindStr == SYCL_GRF_SIZE_ATTR) &&
       !llvm::esimd::isESIMD(F)) {

llvm/lib/SYCLLowerIR/CompileTimePropertiesPass.cpp

@@ -1300,25 +1300,6 @@ extern __DPCPP_SYCL_EXTERNAL
     std::enable_if_t<std::is_integral_v<to> && std::is_unsigned_v<to>, to>
     __spirv_ConvertPtrToU(from val) noexcept;
 
-template <typename RetT, typename... ArgsT>
-extern __DPCPP_SYCL_EXTERNAL __spv::__spirv_TaskSequenceINTEL *
-__spirv_TaskSequenceCreateINTEL(RetT (*f)(ArgsT...), int Pipelined = -1,
-                                int ClusterMode = -1,
-                                unsigned int ResponseCapacity = 0,
-                                unsigned int InvocationCapacity = 0) noexcept;
-
-template <typename... ArgsT>
-extern __DPCPP_SYCL_EXTERNAL void
-__spirv_TaskSequenceAsyncINTEL(__spv::__spirv_TaskSequenceINTEL *TaskSequence,
-                               ArgsT... Args) noexcept;
-
-template <typename RetT>
-extern __DPCPP_SYCL_EXTERNAL RetT __spirv_TaskSequenceGetINTEL(
-    __spv::__spirv_TaskSequenceINTEL *TaskSequence) noexcept;
-
-extern __DPCPP_SYCL_EXTERNAL void __spirv_TaskSequenceReleaseINTEL(
-    __spv::__spirv_TaskSequenceINTEL *TaskSequence) noexcept;
-
 #else  // if !__SYCL_DEVICE_ONLY__
 
 template <typename dataT>

llvm/test/SYCLLowerIR/CompileTimePropertiesPass/kernel-attributes/fpga-cluster.ll

@@ -123,8 +123,6 @@ template <typename T, std::size_t R, std::size_t C, MatrixLayout L,
           MatrixUse U = MatrixUse::MatrixA>
 struct __spirv_JointMatrixINTEL;
 
-struct __spirv_TaskSequenceINTEL;
-
 } // namespace __spv
 
 #ifdef __SYCL_DEVICE_ONLY__

sycl/include/CL/__spirv/spirv_ops.hpp

@@ -318,11 +318,6 @@
 #define __SYCL_ALL_DEVICES_HAVE_ext_oneapi_graph__ 0
 #endif
 
-#ifndef __SYCL_ALL_DEVICES_HAVE_ext_intel_fpga_task_sequence__
-// __SYCL_ASPECT(ext_intel_fpga_task_sequence, 62)
-#define __SYCL_ALL_DEVICES_HAVE_ext_intel_fpga_task_sequence__ 0
-#endif
-
 #ifndef __SYCL_ALL_DEVICES_HAVE_ext_oneapi_limited_graph__
 // __SYCL_ASPECT(ext_oneapi_limited_graph, 63)
 #define __SYCL_ALL_DEVICES_HAVE_ext_oneapi_limited_graph__ 0
@@ -691,11 +686,6 @@
 #define __SYCL_ANY_DEVICE_HAS_ext_oneapi_graph__ 0
 #endif
 
-#ifndef __SYCL_ANY_DEVICE_HAS_ext_intel_fpga_task_sequence__
-// __SYCL_ASPECT(ext_intel_fpga_task_sequence__, 62)
-#define __SYCL_ANY_DEVICE_HAS_ext_intel_fpga_task_sequence__ 0
-#endif
-
 #ifndef __SYCL_ANY_DEVICE_HAS_ext_oneapi_limited_graph__
 // __SYCL_ASPECT(ext_oneapi_limited_graph, 63)
 #define __SYCL_ANY_DEVICE_HAS_ext_oneapi_limited_graph__ 0

sycl/include/CL/__spirv/spirv_types.hpp

@@ -1,5 +1,5 @@
-//===--------------------- fpga_kernel_properties.hpp ---------------------===//
-// SYCL properties associated with FPGA kernel properties
+//==----- fpga_kernel_properties.hpp - SYCL properties associated with FPGA
+// kernel properties ---==//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -12,15 +12,11 @@
 #include <sycl/ext/oneapi/properties/property.hpp>
 #include <sycl/ext/oneapi/properties/property_value.hpp>
 
-#include <cstdint>     // for uint16_t
-#include <type_traits> // for true_type
-
 namespace sycl {
 inline namespace _V1 {
 namespace ext::intel::experimental {
 
 template <typename T, typename PropertyListT> class fpga_kernel_attribute;
-template <auto &f, typename PropertyListT> class task_sequence;
 
 enum class streaming_interface_options_enum : std::uint16_t {
   accept_downstream_stall,
@@ -32,11 +28,6 @@ enum class register_map_interface_options_enum : std::uint16_t {
   wait_for_done_write,
 };
 
-enum class fpga_cluster_options_enum : std::uint16_t {
-  stall_free,
-  stall_enable
-};
-
 struct streaming_interface_key
     : oneapi::experimental::detail::compile_time_property_key<
           oneapi::experimental::detail::PropKind::StreamingInterface> {
@@ -63,15 +54,6 @@ struct pipelined_key : oneapi::experimental::detail::compile_time_property_key<
       std::integral_constant<int, pipeline_directive_or_initiation_interval>>;
 };
 
-struct fpga_cluster_key
-    : oneapi::experimental::detail::compile_time_property_key<
-          oneapi::experimental::detail::PropKind::FPGACluster> {
-  template <fpga_cluster_options_enum option>
-  using value_t = ext::oneapi::experimental::property_value<
-      fpga_cluster_key,
-      std::integral_constant<fpga_cluster_options_enum, option>>;
-};
-
 template <streaming_interface_options_enum option =
               streaming_interface_options_enum::accept_downstream_stall>
 inline constexpr streaming_interface_key::value_t<option> streaming_interface;
@@ -102,18 +84,6 @@ inline constexpr pipelined_key::value_t<
     pipeline_directive_or_initiation_interval>
     pipelined;
 
-template <fpga_cluster_options_enum option =
-              fpga_cluster_options_enum::stall_free>
-inline constexpr fpga_cluster_key::value_t<option> fpga_cluster;
-
-inline constexpr fpga_cluster_key::value_t<
-    fpga_cluster_options_enum::stall_free>
-    stall_free_clusters;
-
-inline constexpr fpga_cluster_key::value_t<
-    fpga_cluster_options_enum::stall_enable>
-    stall_enable_clusters;
-
 } // namespace ext::intel::experimental
 
 namespace ext::oneapi::experimental {
@@ -133,22 +103,6 @@ struct is_property_key_of<
     intel::experimental::fpga_kernel_attribute<T, PropertyListT>>
     : std::true_type {};
 
-template <typename T, typename PropertyListT>
-struct is_property_key_of<
-    intel::experimental::fpga_cluster_key,
-    intel::experimental::fpga_kernel_attribute<T, PropertyListT>>
-    : std::true_type {};
-
-template <auto &f, typename PropertyListT>
-struct is_property_key_of<intel::experimental::pipelined_key,
-                          intel::experimental::task_sequence<f, PropertyListT>>
-    : std::true_type {};
-
-template <auto &f, typename PropertyListT>
-struct is_property_key_of<intel::experimental::fpga_cluster_key,
-                          intel::experimental::task_sequence<f, PropertyListT>>
-    : std::true_type {};
-
 namespace detail {
 template <intel::experimental::streaming_interface_options_enum Stall_Free>
 struct PropertyMetaInfo<
@@ -170,14 +124,6 @@ struct PropertyMetaInfo<intel::experimental::pipelined_key::value_t<Value>> {
   static constexpr int value = Value;
 };
 
-template <intel::experimental::fpga_cluster_options_enum ClusterType>
-struct PropertyMetaInfo<
-    intel::experimental::fpga_cluster_key::value_t<ClusterType>> {
-  static constexpr const char *name = "sycl-fpga-cluster";
-  static constexpr intel::experimental::fpga_cluster_options_enum value =
-      ClusterType;
-};
-
 } // namespace detail
 } // namespace ext::oneapi::experimental
 } // namespace _V1