[SYCLomatic] Refine migration of thrust::transform_if using Rewriter framework(#826)

Signed-off-by: chenwei.sun <[email protected]>

Author: tomflinda

clang/lib/DPCT/APINamesMapThrust.inc

@@ -21,7 +21,6 @@
 ****************************************************************************/
 ENTRY_HOST("thrust::sequence", MapNames::getDpctNamespace() + "iota", "oneapi::dpl::execution::sycl")
 ENTRY_HOST("thrust::sort", "oneapi::dpl::sort", "oneapi::dpl::execution::sycl")
-ENTRY_HOST("thrust::transform_if", MapNames::getDpctNamespace() + "transform_if", "oneapi::dpl::execution::sycl")
 ENTRY_HOST("thrust::reduce", "std::reduce", "oneapi::dpl::execution::sycl")
 ENTRY_HOST("thrust::device_free", MapNames::getDpctNamespace() + "free_device", "")
 ENTRY_HOST("thrust::device_malloc", MapNames::getDpctNamespace() + "malloc_device", "")

clang/lib/DPCT/APINamesThrust.inc

@@ -113,6 +113,15 @@ thrustFactory("thrust::scatter",
               {{5,PolicyState::HasPolicy,4,MapNames::getDpctNamespace()+"scatter", HelperFeatureEnum::DplExtrasAlgorithm_scatter },
                {4,PolicyState::NoPolicy ,4,MapNames::getDpctNamespace()+"scatter", HelperFeatureEnum::DplExtrasAlgorithm_scatter }}),
 
+// thrust::transform_if
+thrustFactory("thrust::transform_if",
+              {{6,PolicyState::HasPolicy,3,MapNames::getDpctNamespace()+"transform_if", HelperFeatureEnum::DplExtrasAlgorithm_transform_if},
+               {5,PolicyState::NoPolicy,3,MapNames::getDpctNamespace()+"transform_if", HelperFeatureEnum::DplExtrasAlgorithm_transform_if},
+               {7,PolicyState::HasPolicy,4,MapNames::getDpctNamespace()+"transform_if", HelperFeatureEnum::DplExtrasAlgorithm_transform_if},
+               {6,PolicyState::NoPolicy,4,MapNames::getDpctNamespace()+"transform_if", HelperFeatureEnum::DplExtrasAlgorithm_transform_if},
+               {8,PolicyState::HasPolicy,4,MapNames::getDpctNamespace()+"transform_if", HelperFeatureEnum::DplExtrasAlgorithm_transform_if},
+               {7,PolicyState::NoPolicy,4,MapNames::getDpctNamespace()+"transform_if", HelperFeatureEnum::DplExtrasAlgorithm_transform_if}}),
+
 // thrust::unique_by_key_copy
 FEATURE_REQUEST_FACTORY(HelperFeatureEnum::DplExtrasAlgorithm_unique_copy,
   CONDITIONAL_FACTORY_ENTRY(

clang/lib/DPCT/ThrustAPIMigration.cpp

@@ -89,7 +89,6 @@ void ThrustAPIRule::thrustFuncMigration(const MatchFinder::MatchResult &Result,
 
   auto ReplInfo =
       MapNames::ThrustFuncNamesMap.find(ThrustFuncNameWithNamespace);
-
   // For the API migration defined in APINamesThrust.inc
   if (ReplInfo == MapNames::ThrustFuncNamesMap.end()) {
     dpct::ExprAnalysis EA;

clang/test/dpct/test_api_level/DplExtrasAlgorithm/api_test12.cu

@@ -5,7 +5,7 @@
 // RUN: FileCheck --input-file %T/DplExtrasAlgorithm/api_test12_out/count.txt --match-full-lines %s
 // RUN: rm -rf %T/DplExtrasAlgorithm/api_test12_out
 
-// CHECK: 6
+// CHECK: 39
 // TEST_FEATURE: DplExtrasAlgorithm_transform_if
 
 #include <thrust/transform.h>