Commit Graph

674 Commits

Author SHA1 Message Date
Alex Voicu 08a0d96448 Fix legacy mode detection of the address of an agent allocated variable. In this mode, there exist two executables per each code object, one created by HCC and one created by HIP. Since we dispatch through HCC in legacy mode, we should obtain the address for an agent allocated variable from the latter's executable. Also add two omitted validity checks, whose absence could lead to segfaults when the current process had no .kernel section and / or when an invalid or empty blob was extracted from the latter.
[ROCm/hip commit: 7c0b9a005b]
2017-11-30 03:29:04 +00:00
Alex Voicu 8d51eaafb6 Revert "Revert adoption of CUDA indexing in general - this can only work with later versions of the compiler, just like module based dispatch, and thus must be guarded against usage in earlier (e.g. 1.6) versions."
This reverts commit 1c50968


[ROCm/hip commit: 32e11e7dc6]
2017-11-29 21:49:10 +00:00
Alex Voicu fcc42f035e Revert "Revert adoption of CUDA indexing in general - this can only work with later versions of the compiler, just like module based dispatch, and thus must be guarded against usage in earlier (e.g. 1.6) versions."
This reverts commit d2fd1f5


[ROCm/hip commit: fbaf729f88]
2017-11-29 21:36:29 +00:00
Alex Voicu c58a083e96 Fix compiler version check.
[ROCm/hip commit: b881cf713c]
2017-11-29 03:05:53 +00:00
Alex Voicu 00e435bda1 Add missing file.
[ROCm/hip commit: 3ed8897a5a]
2017-11-29 02:16:44 +00:00
Alex Voicu b996310710 Fix oversight in selection mechanism which led to erroneous code to be compiled for the grid_launch_GGL component.
[ROCm/hip commit: faa546d194]
2017-11-29 01:37:52 +00:00
Alex Voicu dd8a589893 Choose whether or not to use functional grid_launch based on the version of HCC used to compile.
[ROCm/hip commit: 89e9399427]
2017-11-29 00:17:44 +00:00
Alex Voicu 8fcd85757a Remove leftover agent allocated globals.
[ROCm/hip commit: 5aeb5dcd6f]
2017-11-28 19:56:04 +00:00
Alex Voicu 9668003fe3 Change memset kernel to use memcpy instead of placement new. Simplify indexers.
[ROCm/hip commit: 6e4ca3fbb4]
2017-11-28 19:45:47 +00:00
Alex Voicu aef26d3477 Re-sync with upstream and re-factor platform global management for texture references.
[ROCm/hip commit: 02c2bfc7ef]
2017-11-28 19:15:29 +00:00
Alex Voicu 11f7d895f4 Merge remote-tracking branch 'origin/master' into feature_use_module_based_dispatch_instead_of_pfe
# Conflicts:
#	src/hip_module.cpp


[ROCm/hip commit: dc67ca3feb]
2017-11-28 17:29:11 +00:00
Maneesh Gupta 3b25286003 Fix float2int rounding functions
Change-Id: I67943859a6344c5eec0eaa23418c9b802ef72468


[ROCm/hip commit: 265c3b224e]
2017-11-28 17:23:43 +00:00
Alex Voicu c2a5825c3c This actually (tries) to do the right thing all the way, by using memcpy for bitcasting, and not rely on undefined behaviour of a different flavour as a substitute for the original undefined behaviour. Note that the compiler will (should) optimise down to the same emitted code, since this is a pattern it understands.
[ROCm/hip commit: a6ccaf3d57]
2017-11-28 17:23:06 +00:00
Alex Voicu 23cc46786a This fixes some outright quaint choices made when implementing HIP's bitwise conversion functions, by using simple reinterpret_casts, as is idiomatic. These functions are supposed to be re-entrant, correct and efficient. Sadly, they were neither: they hid a massive race condition against a value stored in global memory, which means that they were also unreasonably slow if they ever managed to be correct, and relied on union based type punning which is in a grey area of the standard. It is difficult to ascertain what may have been the reason for coming up with this quirky solution.
[ROCm/hip commit: a401ce6e5d]
2017-11-28 17:23:06 +00:00
Ben Sander d31ef2b462 Merge pull request #256 from gargrahul/texture_driver_api_support
Texture driver APIs support

[ROCm/hip commit: 0da0426f94]
2017-11-27 13:52:39 -06:00
Maneesh Gupta 2e043b7c0e Fix float2int rounding functions
Change-Id: I67943859a6344c5eec0eaa23418c9b802ef72468


[ROCm/hip commit: 4c96882366]
2017-11-23 09:57:24 +05:30
Rahul Garg 13879387e5 Fixed review comments
[ROCm/hip commit: 56862b1c35]
2017-11-21 21:19:06 +05:30
Alex Voicu d71132de7c This corrects how addresses are formed for symbols which reside in shared objects. For this case, the .value component of an ELF symbol holds the offset from the base VA where the shared object was loaded. Thus, to correctly obtain the VA of the object refered by the symbol, we must add the offset to the VA where the shared object is loaded. We were already doing this correctly for symbols denoting functions, but we were incorrect for those denoting objects.
[ROCm/hip commit: 5e16ee0d1f]
2017-11-21 13:15:13 +00:00
Rahul Garg 03552f2e94 Changed function hipMemcpy_2D to hipMemcpyParam2D
[ROCm/hip commit: 9866fa250d]
2017-11-21 12:36:24 +05:30
Alex Voicu 45ff3c31c4 Refactor the __device__ versions of memset and memcpy to be less awkward i.e. not return nullptr as opposed to the destination pointer (it can only be assumed it was done for maximum confusion) and actually unroll as they claim to. Change all of the {to, from}Symbol functions to use hipModuleGetGlobal, as opposed to hc::accelerator::get_symbol_address which is no longer valid with module based dispatch.
[ROCm/hip commit: 9d088d2283]
2017-11-21 02:40:34 +00:00
Alex Voicu e8ca14848e Clean-up some remaining noise in program_state.cpp.
[ROCm/hip commit: 1824fb7698]
2017-11-20 22:41:46 +00:00
Alex Voicu 69f8043d12 Correct ill-formed merge in earlier commit and adjust for differences with the new CUDA natural indexing mechanism.
[ROCm/hip commit: 7d5a45ac1a]
2017-11-20 16:33:52 +00:00
Alex Voicu 3c936777aa Re-sync with upstream.
[ROCm/hip commit: c5f2b22d0d]
2017-11-20 15:34:50 +00:00
Ben Sander 6e332812fc Merge pull request #264 from pzins/missing_end_marker
Fix missing MARKER_END

[ROCm/hip commit: e8ede28ec4]
2017-11-20 06:08:01 -06:00
Rahul Garg 97ee22c3f5 -Moved coGlobals in hipModule class (takes care of multi module case)
-Used mutex scope for updating coGlobals


[ROCm/hip commit: f97c5f9a64]
2017-11-20 16:23:18 +05:30
Rahul Garg 62f20c6dc8 Update hipModuleGetTexRef API
[ROCm/hip commit: c7d60a7a75]
2017-11-19 22:10:46 +05:30
Alex Voicu 962bf7bfda This implements the trivial change needed to move back from the hip{Something}_{x, y, z} macros to the natural CUDA syntax of Something.{x, y, z}. This is contained in lines 384-404 in hip_runtime.h. All of the other changes have to do with changing unit tests to use this syntax. The macros are retained for backwards compatibility.
[ROCm/hip commit: cffd0e14eb]
2017-11-19 01:54:12 +00:00
Rahul Garg e5aae56998 Removed redundant desc variable
[ROCm/hip commit: ae1eb7a03a]
2017-11-15 18:28:27 +05:30
Rahul Garg 58b37dce5f -Fixed texture driver API sample
-Added hipTexRefSetAddress and hipTexRefSetAddress2D APIs


[ROCm/hip commit: 4b19c2aa0c]
2017-11-15 18:23:28 +05:30
Rahul Garg 0263292087 Texture code reorganized
[ROCm/hip commit: 63680edd30]
2017-11-14 11:09:35 +05:30
Pierre d917c6b546 Fix missing MARKER_END
Logging status of hipCtxSynchronize was missing
Test if hip profiling is active for MARKER_END in ihipPostLaunchKernel
Add MARKER_END after the completion of a kernel launched through
the "grid launch"


[ROCm/hip commit: 6baaed8e48]
2017-11-13 16:13:19 -05:00
Alex Voicu f08f1efab8 Merge remote-tracking branch 'origin/master' into feature_use_module_based_dispatch_instead_of_pfe
[ROCm/hip commit: f7726cd416]
2017-11-09 23:43:07 +00:00
Rahul Garg 49a2c6468e Texture driver APIs support
[ROCm/hip commit: ef09c4918d]
2017-11-09 22:10:55 +05:30
Maneesh Gupta 56d3677499 Merge pull request #250 from AlexVlx/feature_add_agent_global_support
Support for agent globals

[ROCm/hip commit: 31bcb59f62]
2017-11-09 07:52:09 +05:30
Alex Voicu 4950373967 Merge remote-tracking branch 'origin/master' into feature_use_module_based_dispatch_instead_of_pfe
# Conflicts:
#	tests/src/runtimeApi/stream/hipStreamSync2.cpp


[ROCm/hip commit: 3d248927e4]
2017-11-08 10:26:30 +00:00
Alex Voicu 35d8af2001 Clean up trailing whitespace so as to reduce noise in #246.
[ROCm/hip commit: d8e323d4b5]
2017-11-08 00:08:55 +00:00
Alex Voicu c3fdb8ab8e Merge remote-tracking branch 'origin/master' into feature_use_module_based_dispatch_instead_of_pfe
[ROCm/hip commit: adaf6b8dff]
2017-11-07 00:01:22 +00:00
Ben Sander d9db9dabeb Check for null event in hipEventElapsedTime
[ROCm/hip commit: f278f67d2d]
2017-11-06 23:49:31 +00:00
Ben Sander 465b24123b hipStreamWaitEvent returns success if event created but not recorded
[ROCm/hip commit: 16708dd2e0]
2017-11-06 23:49:31 +00:00
Ben Sander f80896d58b Make hipEvent_t thread safe.
Support re-recording of same event by different threads.

- Add criticalData structure to hipEvent_t, similar to mechanism used
  for streams, contexts, device.  Events are always locked
  after streams to avoid deadlock.
- ihipEvent_t::locked_copyCrit can be used to copy critical state
  including marker.  The critical state in the event can then
  be re-recorded.
- refactor hipEventElapsedTime.  Remmove stale debug code, native signal
  refs.


[ROCm/hip commit: 4a2e6f8955]
2017-11-06 23:49:25 +00:00
Maneesh Gupta 33836c9521 Merge pull request #251 from ROCm-Developer-Tools/fix_event_state
Set event state AFTER it is recorded.

[ROCm/hip commit: 1131c9e41a]
2017-11-06 07:28:11 +05:30
Maneesh Gupta 8845e38efd Merge pull request #249 from bensander/warn_event
Add HIP_DB=warn + message if sync on dangerous event.

[ROCm/hip commit: a62d5aa875]
2017-11-06 07:25:40 +05:30
Ben Sander 6a4c50cf6c Set event state AFTER it is recorded.
[ROCm/hip commit: 4c3b65a5cd]
2017-11-05 10:33:18 -06:00
Alex Voicu 1f911cd23a Merge remote-tracking branch 'origin/master' into feature_use_module_based_dispatch_instead_of_pfe
# Conflicts:
#	src/hip_module.cpp


[ROCm/hip commit: bb1176001f]
2017-11-03 10:53:39 +00:00
Alex Voicu 28eb8e2c3e This introduces correct support for agent global variables, and implements hipModuleGetGlobal as an actual equivalent for cuModuleGetGlobal.
[ROCm/hip commit: 328c18b886]
2017-11-03 01:44:48 +00:00
Alex Voicu dab971370e Correctly deal with functions from shared objects, wherein the program visible VA == so_base_va + st_value(function_symbol). Remove quaint usage of pfe for hipMemset (which is actually fill_n).
[ROCm/hip commit: 2cacda91bb]
2017-11-01 22:33:13 +00:00
Ben Sander 2979a99888 Merge pull request #237 from bensander/use_ctxptr_for_p2p
Use ctxptr for p2p

[ROCm/hip commit: 09d866a639]
2017-11-01 18:55:25 +01:00
Ben Sander 6c60773e82 Add HIP_DB=warn + message if sync on dangerous event.
[ROCm/hip commit: 70c25bdf8e]
2017-11-01 10:44:34 -07:00
Ben Sander 6f3b28d27c Merge pull request #245 from scchan/centos_fixes
various fixes for centos/rhel

[ROCm/hip commit: 86f62accfd]
2017-11-01 18:10:29 +01:00
Alex Voicu 70a41e7dac This switches HIP from its currently convoluted macro + pfe based dispatch mechanism to a more natural one partially based on the existing module API. The basic idea is that HCC will always correctly emit __global__ functions: as empty-bodied stubs, on host, and as kernels, on device. It then becomes trivial to obtain the mangled name on host, at dispatch, from the function's address, and then to use the mangled name to retrieve the kernel. This should address all problems stemming from serialisation, dubious mismatches due to the manufactured functor, macro-isms et al. It also immediately enables support for generalised globals as a consequence of that being available in the module API. Finally, it will make debug much easier, since the actual names of the __global__ functions will automatically be used in traces etc. One detail is that due to how dispatch works now (hipLaunchKernel and hipLaunchKernelGGL are themselves variadic function templates which deduce the function type of the callee), in certain cases it may be necesssary to insert explicit casts to ensure that the variadic argument list selects a viable overload - this can be observed in some unit tests. Eventually we may be able to remove this limitation, but for now it does not appear terribly onerous. The code is not extremely HIPpie, nor is it fully optimised, but rather is intended as a starting point for the HIP team to make its own.
[ROCm/hip commit: c2482d1255]
2017-11-01 15:09:59 +00:00