Merge branch 'migx-jit-lib' into migraphx

include/ck/tensor_operation/gpu/device/impl/device_gemm_multiple_d_xdl_cshuffle.hpp

@@ -577,9 +577,7 @@ struct DeviceGemmMultipleD_Xdl_CShuffle : public DeviceGemmMultipleD<ALayout,
 
     static bool IsSupportedArgument(const Argument& arg)
     {
-        if(!(ck::get_device_name() == "gfx908" || ck::get_device_name() == "gfx90a" ||
-             ck::get_device_name() == "gfx940" || ck::get_device_name() == "gfx941" ||
-             ck::get_device_name() == "gfx942"))
+        if(!ck::is_xdl_supported())
         {
             return false;
         }

library/src/jit_library/src/device_gemm_multiple_d.cpp

@@ -141,6 +141,8 @@ Solution Problem::MakeSolution(std::size_t idx, const std::string& arch) const
         std::string{},
         [](const std::string& a, const std::string& b) { return a.empty() ? b : a + ", " + b; });
     str = params.front() + "< " + str + ">";
+    if (params.back().find("v2") != std::string::npos and K % k_per_block != 0)
+        str = "";
 
     return Solution{str, block_size, grid_size};
 }
@@ -156,7 +158,9 @@ std::vector<Solution> Problem::GetSolutions(const std::string& arch) const
     const std::size_t num_instances = GetInstances(arch).size();
     for(std::size_t i = 0; i < num_instances; ++i)
     {
-        solutions.push_back(MakeSolution(i, arch));
+        auto solution = MakeSolution(i, arch);
+        if (solution.template_str != "")
+            solutions.push_back(solution);
     }
 
     return solutions;