Revert "Add subgroup topk kernel for XPU (part1 of #3369) (#3371)"

src/ATen/native/xpu/sycl/TensorTopKKernel.cpp

@@ -16,7 +16,6 @@
 #include <ATen/native/xpu/sycl/SortingKernels.h>
 
 #include <ATen/native/xpu/sycl/TensorTopKKernel.h>
-#include <ATen/native/xpu/sycl/TensorTopKSbtopkKernel.h>
 
 namespace at {
 namespace native {
@@ -114,25 +113,17 @@ void topk_kernel(
         const scalar_t* self_ptr = self_.const_data_ptr<scalar_t>();
         scalar_t* values_ptr = values_.data_ptr<scalar_t>();
         int64_t* indices_ptr = indices_.data_ptr<int64_t>();
-
-        SbtopkResult sbtopk_result = sbtopk_try_launch(
-            self_, nsegments, nelements, k, largest, values_, indices_);
-        if (sbtopk_result == SbtopkResult::FAILED) {
-          segmented_group_select_pairs<scalar_t, int64_t>(
-              self_ptr,
-              values_ptr,
-              nullptr,
-              (int64_t*)indices_ptr,
-              nsegments,
-              nelements,
-              k,
-              largest);
-        }
-
-        // Only sort if the user asked for sorted output AND the optimized
-        // kernel did not already produce a sorted result. The subgroup topk
-        // kernel returns SORTED; the original kernel returns FAILED.
-        if (sorted && sbtopk_result != SbtopkResult::SORTED) {
+        segmented_group_select_pairs<scalar_t, int64_t>(
+            self_ptr,
+            values_ptr,
+            nullptr,
+            (int64_t*)indices_ptr,
+            nsegments,
+            nelements,
+            k,
+            largest);
+
+        if (sorted) {
           segmented_sort_pairs<scalar_t, int64_t>(
               values_ptr,
               values_ptr,