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

[ROCm/clr commit: c6ab6f292b]
2017-11-29 00:17:44 +00:00
parent e85f49a57e
commit cdac21c81a
9 changed files with 1436 additions and 256 deletions
@@ -0,0 +1,99 @@
+/*
+Copyright (c) 2015 - present Advanced Micro Devices, Inc. All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+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"
+
+// Internal header, do not percolate upwards.
+#include "hip_hcc_internal.h"
+#include "hc.hpp"
+#include "trace_helper.h"
+
+#include <iostream>
+#include <sstream>
+
+namespace hip_impl
+{
+    hc::accelerator_view lock_stream_hip_(
+        hipStream_t& stream, void*& locked_stream)
+    {   // This allocated but does not take ownership of locked_stream. If it is
+        // not deleted elsewhere it will leak.
+        using L = decltype(stream->lockopen_preKernelCommand());
+
+        HIP_INIT();
+
+        stream = ihipSyncAndResolveStream(stream);
+        locked_stream = new L{stream->lockopen_preKernelCommand()};
+        return (*static_cast<L*>(locked_stream))->_av;
+    }
+
+    void print_prelaunch_trace_(
+        const char* kernel_name,
+        dim3 num_blocks,
+        dim3 dim_blocks,
+        int group_mem_bytes,
+        hipStream_t stream)
+    {
+        if ((HIP_TRACE_API & (1 << TRACE_KCMD)) ||
+            HIP_PROFILE_API ||
+            (COMPILE_HIP_DB && (HIP_TRACE_API & (1<<TRACE_ALL)))) {
+            std::stringstream os;
+            os  << tls_tidInfo.tid() << "." << tls_tidInfo.apiSeqNum()
+                << " hipLaunchKernel '" << kernel_name << "'"
+                << " gridDim:"  << num_blocks
+                << " groupDim:" << dim_blocks
+                << " sharedMem:+" << group_mem_bytes
+                << " " << *stream;
+
+            if (HIP_PROFILE_API == 0x1) {
+                std::string shortAtpString("hipLaunchKernel:");
+                shortAtpString += kernel_name;
+                MARKER_BEGIN(shortAtpString.c_str(), "HIP");
+            } else if (HIP_PROFILE_API == 0x2) {
+                MARKER_BEGIN(os.str().c_str(), "HIP");
+            }
+
+            if (COMPILE_HIP_DB && HIP_TRACE_API) {
+                std::string fullStr;
+                recordApiTrace(&fullStr, os.str());
+            }
+        }
+    }
+
+    void unlock_stream_hip_(
+        hipStream_t stream,
+        void* locked_stream,
+        const char* kernel_name,
+        hc::accelerator_view* acc_v)
+    {   // Precondition: acc_v is the accelerator_view associated with stream
+        //               which is guarded by locked_stream;
+        //               locked_stream is deletable.
+        using L = decltype(stream->lockopen_preKernelCommand());
+
+        stream->lockclose_postKernelCommand(kernel_name, acc_v);
+
+        delete static_cast<L*>(locked_stream);
+        locked_stream = nullptr;
+        if(HIP_PROFILE_API) {
+            MARKER_END();
+        }
+    }
+}