Choose whether or not to use functional grid_launch based on the version of HCC used to compile.

2017-11-29 00:17:44 +00:00
parent 5aeb5dcd6f
commit 89e9399427
9 changed files with 1436 additions and 256 deletions
@@ -20,119 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */

-#include "hip/hcc_detail/grid_launch_GGL.hpp"
-#include "hip/hcc_detail/program_state.hpp"
-
-#include "hip/hip_runtime_api.h"
-
-// Internal header, do not percolate upwards.
-#include "hip_hcc_internal.h"
-#include "hc.hpp"
-#include "trace_helper.h"
-
-#include <cassert>
-#include <cstddef>
-#include <cstdint>
-#include <stdexcept>
-
-#include <iostream>
-
-using namespace hc;
-using namespace std;
-
-namespace hip_impl
-{
-    namespace
-    {
-        inline
-        string name(uintptr_t function_address)
-        {
-            const auto it = function_names().find(function_address);
-
-            if (it == function_names().cend())  {
-                throw runtime_error{
-                    "Invalid function passed to hipLaunchKernelGGL."};
-            }
-
-            return it->second;
-        }
-
-        inline
-        string name(hsa_agent_t agent)
-        {
-            char n[64] = {};
-            hsa_agent_get_info(agent, HSA_AGENT_INFO_NAME, n);
-
-            return string{n};
-        }
-
-        inline
-        hsa_agent_t target_agent(hipStream_t stream)
-        {
-            if (stream) {
-                return *static_cast<hsa_agent_t*>(
-                    stream->locked_getAv()->get_hsa_agent());
-            }
-            else if (
-                ihipGetTlsDefaultCtx() && ihipGetTlsDefaultCtx()->getDevice()) {
-                return ihipGetDevice(
-                    ihipGetTlsDefaultCtx()->getDevice()->_deviceId)->_hsaAgent;
-            }
-            else {
-                return *static_cast<hsa_agent_t*>(
-                    accelerator{}.get_default_view().get_hsa_agent());
-            }
-        }
-    }
-
-    void hipLaunchKernelGGLImpl(
-        uintptr_t function_address,
-        const dim3& numBlocks,
-        const dim3& dimBlocks,
-        uint32_t sharedMemBytes,
-        hipStream_t stream,
-        void** kernarg)
-    {
-        const auto it0 = functions().find(function_address);
-
-        if (it0 == functions().cend()) {
-            throw runtime_error{
-                "No device code available for function: " +
-                name(function_address)
-            };
-        }
-
-        auto agent = target_agent(stream);
-
-        const auto it1 = find_if(
-            it0->second.cbegin(),
-            it0->second.cend(),
-            [=](const pair<hsa_agent_t, Kernel_descriptor>& x) {
-                return x.first.handle == agent.handle;
-            });
-
-        if (it1 == it0->second.cend()) {
-            throw runtime_error{
-                "No code available for function: " + name(function_address) +
-                ", for agent: " + name(agent)
-            };
-        }
-
-        for (auto&& agent_kernel : it0->second) {
-            if (agent.handle == agent_kernel.first.handle) {
-                hipModuleLaunchKernel(
-                    agent_kernel.second,
-                    numBlocks.x,
-                    numBlocks.y,
-                    numBlocks.z,
-                    dimBlocks.x,
-                    dimBlocks.y,
-                    dimBlocks.z,
-                    sharedMemBytes,
-                    stream,
-                    nullptr,
-                    kernarg);
-            }
-        }
-    }
-}
+#if defined(FUNCTIONAL_GRID_LAUNCH)
+    #include "functional_grid_launch.inl"
+#else
+    #include "macro_based_grid_launch.inl"
+#endif