fix changes before merging

Author: HabKaffee

sycl/unittests/program_manager/passing_link_and_compile_options.cpp

@@ -32,14 +32,13 @@ template <> struct KernelInfo<EAMTestKernel> {
 } // namespace sycl
 } // __SYCL_INLINE_NAMESPACE(cl)
 
-
+template <typename T>
 static sycl::unittest::PiImage generateEAMTestKernelImage(std::string _cmplOptions = "", std::string _lnkOptions = "") {
   using namespace sycl::unittest;
 
-  // Eliminated arguments are 1st and 3rd.
   std::vector<unsigned char> KernelEAM{0b00000101};
   PiProperty EAMKernelPOI = makeKernelParamOptInfo(
-      EAMTestKernelName, EAMTestKernelNumArgs, KernelEAM);
+      sycl::detail::KernelInfo<T>::getName(), EAMTestKernelNumArgs, KernelEAM);
   PiArray<PiProperty> ImgKPOI{std::move(EAMKernelPOI)};
 
   PiPropertySet PropSet;
@@ -52,8 +51,8 @@ static sycl::unittest::PiImage generateEAMTestKernelImage(std::string _cmplOptio
 
   PiImage Img{PI_DEVICE_BINARY_TYPE_SPIRV,            // Format
               __SYCL_PI_DEVICE_BINARY_TARGET_SPIRV64, // DeviceTargetSpec
-              _cmplOptions.c_str(),                   // Compile options
-              _lnkOptions.c_str(),                    // Link options
+              _cmplOptions, // Compile options
+              _lnkOptions,   // Link options
               std::move(Bin),
               std::move(Entries),
               std::move(PropSet)};
@@ -62,91 +61,52 @@ static sycl::unittest::PiImage generateEAMTestKernelImage(std::string _cmplOptio
 }
 
 
-static pi_result redefinedProgramLink(pi_context, pi_uint32, const pi_device *,
+inline pi_result redefinedProgramLink(pi_context, pi_uint32, const pi_device *,
                                       const char * _linkOpts, pi_uint32,
                                       const pi_program *,
                                       void (*)(pi_program, void *), void *,
                                       pi_program *) {
-  if (_linkOpts) {
-      current_link_options = std::string(_linkOpts);
-  }
+  assert(_linkOpts != nullptr);
+  current_link_options = std::string(_linkOpts);
+  std::cout << "Passed link options --> " << _linkOpts << std::endl;
   return PI_SUCCESS;
 }
 
-static pi_result redefinedProgramCompile(pi_program, pi_uint32,
+inline pi_result redefinedProgramCompile(pi_program, pi_uint32,
                                          const pi_device *, const char * _compileOpts,
                                          pi_uint32, const pi_program *,
                                          const char **,
                                          void (*)(pi_program, void *), void *) {
-  if (_compileOpts) {
-      current_compile_options = std::string(_compileOpts);
-  }
+  assert(_compileOpts != nullptr);
+  current_compile_options = std::string(_compileOpts);
+  std::cout << "Passed compile options --> " << _compileOpts << std::endl;
   return PI_SUCCESS;
 }
 
-TEST(Link_Compile_Options, linkOptionsTest_empty) {
+TEST(Link_Compile_Options, compile_link_Options_Test_empty) {
     sycl::platform Plt{sycl::default_selector()};
     sycl::unittest::PiMock Mock{Plt};
-
+    setupDefaultMockAPIs(Mock);
     Mock.redefine<sycl::detail::PiApiKind::piProgramCompile>(redefinedProgramCompile);
     Mock.redefine<sycl::detail::PiApiKind::piProgramLink>(redefinedProgramLink);
-
+    
+    const sycl::device Dev = Plt.get_devices()[0];
 
     current_link_options.clear();
     current_compile_options.clear();
     std::string expected_compile_options = "";
     std::string expected_link_options = "";
-    static sycl::unittest::PiImage DevImage = generateEAMTestKernelImage(expected_compile_options, expected_link_options);
-    auto BundleObj = sycl::compile(DevImage);
-    sycl::link(BundleObj);
-    EXPECT_EQ(expected_link_options, current_link_options);
-}
+    static sycl::unittest::PiImage DevImage = generateEAMTestKernelImage<EAMTestKernel>(expected_compile_options, expected_link_options);
+    auto KernelID = sycl::get_kernel_id<EAMTestKernel>();
 
-TEST(Link_Compile_Options, linkOptionsTest_one_param) {
-    sycl::platform Plt{sycl::default_selector()};
-    sycl::unittest::PiMock Mock{Plt};
+    sycl::queue Queue{Dev};
 
-    Mock.redefine<sycl::detail::PiApiKind::piProgramCompile>(redefinedProgramCompile);
-    Mock.redefine<sycl::detail::PiApiKind::piProgramLink>(redefinedProgramLink);
+    const sycl::context Ctx = Queue.get_context();
+    sycl::kernel_bundle KernelBundle =
+      sycl::get_kernel_bundle<sycl::bundle_state::input>(Ctx, {Dev}, {KernelID});
 
-    current_link_options.clear();
-    current_compile_options.clear();
-    std::string expected_compile_options = "";
-    std::string expected_link_options = "-foo";
-    static sycl::unittest::PiImage DevImage = generateEAMTestKernelImage(expected_compile_options, expected_link_options);
-    auto BundleObj = sycl::compile(DevImage);
+    auto BundleObj = sycl::compile(KernelBundle);
     sycl::link(BundleObj);
     EXPECT_EQ(expected_link_options, current_link_options);
-}
-
-TEST(Link_Compile_Options, compileOptionsTest_empty) {
-    sycl::platform Plt{sycl::default_selector()};
-    sycl::unittest::PiMock Mock{Plt};
-
-    Mock.redefine<sycl::detail::PiApiKind::piProgramCompile>(redefinedProgramCompile);
-    Mock.redefine<sycl::detail::PiApiKind::piProgramLink>(redefinedProgramLink);
-
-    current_link_options.clear();
-    current_compile_options.clear();
-    std::string expected_compile_options = "";
-    std::string expected_link_options = "";
-    static sycl::unittest::PiImage DevImage = generateEAMTestKernelImage(expected_compile_options, expected_link_options);
-    auto BundleObj = sycl::compile(DevImage);
-    EXPECT_EQ(expected_link_options, current_link_options);
-}
-
-TEST(Link_Compile_Options, compileOptionsTest_one_param) {
-    sycl::platform Plt{sycl::default_selector()};
-    sycl::unittest::PiMock Mock{Plt};
-
-    Mock.redefine<sycl::detail::PiApiKind::piProgramCompile>(redefinedProgramCompile);
-    Mock.redefine<sycl::detail::PiApiKind::piProgramLink>(redefinedProgramLink);
-    
-    current_link_options.clear();
-    current_compile_options.clear();
-    std::string expected_compile_options = "-foo";
-    std::string expected_link_options = "";
-    static sycl::unittest::PiImage DevImage = generateEAMTestKernelImage(expected_compile_options, expected_link_options);
-    auto BundleObj = sycl::compile(DevImage);
-    EXPECT_EQ(expected_link_options, current_link_options);
+    EXPECT_EQ(expected_compile_options + " ", current_compile_options);
 }