Commit Graph
64512 Commits
Author SHA1 Message Date
Alex Voicu acc05cdff7 Remove leftover comment.
[ROCm/hip commit: 08f252e4bf]
2017-11-22 19:37:03 +00:00
Alex Voicu 08f252e4bf Remove leftover comment. 2017-11-22 19:37:03 +00:00
Evgeny Mankov d7e1419d8b Merge pull request #263 from ChrisKitching/headers
[HIPIFY] Add hipify mappings for all CUDA headers that have HIP equivalents

[ROCm/clr commit: 6bddac1cfa]
2017-11-22 21:24:21 +03:00
Evgeny Mankov 6bddac1cfa Merge pull request #263 from ChrisKitching/headers
[HIPIFY] Add hipify mappings for all CUDA headers that have HIP equivalents
2017-11-22 21:24:21 +03:00
Evgeny Mankov 52b93658a9 Merge pull request #263 from ChrisKitching/headers
[HIPIFY] Add hipify mappings for all CUDA headers that have HIP equivalents

[ROCm/hip commit: 4e92a034d0]
2017-11-22 21:24:21 +03:00
Evgeny Mankov 4e92a034d0 Merge pull request #263 from ChrisKitching/headers
[HIPIFY] Add hipify mappings for all CUDA headers that have HIP equivalents
2017-11-22 21:24:21 +03:00
Amber Lin 6f7b55f2d8 Add debug message in PMC trace
Print data in PMC trace when the debug level is set to 7(pr_debug).

Change-Id: I9abbb8f6c3f7962fb637528578c1a58b7784042d
Signed-off-by: Amber Lin <Amber.Lin@amd.com>
2017-11-22 10:09:49 -05:00
Amber Lin b3439f48c2 Add debug message in PMC trace
Print data in PMC trace when the debug level is set to 7(pr_debug).

Change-Id: I9abbb8f6c3f7962fb637528578c1a58b7784042d
Signed-off-by: Amber Lin <Amber.Lin@amd.com>


[ROCm/ROCR-Runtime commit: 6f7b55f2d8]
2017-11-22 10:09:49 -05:00
foreman 198f7e4168 P4 to Git Change 1485337 by todli@todli-win-opencl-kv1 on 2017/11/21 18:53:38
SWDEV-126904 - Fix conformance Pipe read/write tests failures for ROCm/LC path and PAL/LC path

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palkernel.cpp#40 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rockernel.cpp#32 edit


[ROCm/clr commit: 4e0baa79b3]
2017-11-21 18:58:23 -05:00
foreman 4e0baa79b3 P4 to Git Change 1485337 by todli@todli-win-opencl-kv1 on 2017/11/21 18:53:38
SWDEV-126904 - Fix conformance Pipe read/write tests failures for ROCm/LC path and PAL/LC path

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palkernel.cpp#40 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rockernel.cpp#32 edit
2017-11-21 18:58:23 -05:00
foreman b5c6043d6e P4 to Git Change 1485325 by gandryey@gera-lnx-rcf on 2017/11/21 18:10:36
SWDEV-136068 - PAL support for Linux Pro: SSG support on OpenCL 1.2
	- Enable LiquidFlash extension when DGMA available only.

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palsettings.cpp#37 edit


[ROCm/clr commit: 0e496d9c9f]
2017-11-21 18:17:45 -05:00
foreman 0e496d9c9f P4 to Git Change 1485325 by gandryey@gera-lnx-rcf on 2017/11/21 18:10:36
SWDEV-136068 - PAL support for Linux Pro: SSG support on OpenCL 1.2
	- Enable LiquidFlash extension when DGMA available only.

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palsettings.cpp#37 edit
2017-11-21 18:17:45 -05:00
Oak Zeng 061db45fe2 Fix unconditional unmap in fmm_map_to_gpu_nodes
_fmm_unmap_from_gpu is called in fmm_map_to_gpu_nodes
to unmap buffer from nodes that is already mapped to
but not in the new map nodes list. Previously, the unmap
was called unconditionally even though the size of the
array to unmap is 0. This fixes the issue by calling
the unmap func only when the unmap array size is not 0.

Also releases the fmm_mutex on error returns

Change-Id: Iadd8383caf7ebb92f02618798c5efd138a352aaa
Signed-off-by: Oak Zeng <Oak.Zeng@amd.com>
2017-11-21 15:16:39 -05:00
Oak Zeng 7486e8e29f Fix unconditional unmap in fmm_map_to_gpu_nodes
_fmm_unmap_from_gpu is called in fmm_map_to_gpu_nodes
to unmap buffer from nodes that is already mapped to
but not in the new map nodes list. Previously, the unmap
was called unconditionally even though the size of the
array to unmap is 0. This fixes the issue by calling
the unmap func only when the unmap array size is not 0.

Also releases the fmm_mutex on error returns

Change-Id: Iadd8383caf7ebb92f02618798c5efd138a352aaa
Signed-off-by: Oak Zeng <Oak.Zeng@amd.com>


[ROCm/ROCR-Runtime commit: 061db45fe2]
2017-11-21 15:16:39 -05:00
Oak Zeng f06e887725 Properly control lifecycle of ptr info objects
Buffer mapping to devices and buffer registration to
devices can be changed b/t two pointer info queries.
Thus update buffer mapping info and registration info
only when mapping and registration changed. This is
done by free mapped_node_id_array on mapping to new
device and free registered_node_id_array on registration
and re-allocate them on next ptr info query.

Also uses fmm_mutex to avoid race conditions in case
of calling hsaKmtQueryPointerInfo concurrently with
calling of buffer mapping or registration

Change-Id: Ibc2e20be1fc0147066f873dfa44b21f5015104b7
Signed-off-by: Oak Zeng <Oak.Zeng@amd.com>
2017-11-21 15:16:29 -05:00
Oak Zeng 84d88b8e1a Properly control lifecycle of ptr info objects
Buffer mapping to devices and buffer registration to
devices can be changed b/t two pointer info queries.
Thus update buffer mapping info and registration info
only when mapping and registration changed. This is
done by free mapped_node_id_array on mapping to new
device and free registered_node_id_array on registration
and re-allocate them on next ptr info query.

Also uses fmm_mutex to avoid race conditions in case
of calling hsaKmtQueryPointerInfo concurrently with
calling of buffer mapping or registration

Change-Id: Ibc2e20be1fc0147066f873dfa44b21f5015104b7
Signed-off-by: Oak Zeng <Oak.Zeng@amd.com>


[ROCm/ROCR-Runtime commit: f06e887725]
2017-11-21 15:16:29 -05:00
Alex Voicu f9b177c0b3 Modify the set component of the memcpy test (unclear why there is a memset component to begin with).
[ROCm/clr commit: 0755f1fc26]
2017-11-21 17:52:01 +00:00
Alex Voicu 0755f1fc26 Modify the set component of the memcpy test (unclear why there is a memset component to begin with). 2017-11-21 17:52:01 +00:00
Alex Voicu d8db534805 Modify the set component of the memcpy test (unclear why there is a memset component to begin with).
[ROCm/hip commit: 4131b47134]
2017-11-21 17:52:01 +00:00
Alex Voicu 4131b47134 Modify the set component of the memcpy test (unclear why there is a memset component to begin with). 2017-11-21 17:52:01 +00:00
Rahul Garg 212afdf56b Fixed review comments
[ROCm/clr commit: 38029f2849]
2017-11-21 21:19:06 +05:30
Rahul Garg 38029f2849 Fixed review comments 2017-11-21 21:19:06 +05:30
Rahul Garg 13879387e5 Fixed review comments
[ROCm/hip commit: 56862b1c35]
2017-11-21 21:19:06 +05:30
Rahul Garg 56862b1c35 Fixed review comments 2017-11-21 21:19:06 +05:30
Alex Voicu 31deac0768 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/clr commit: fb1021cc0a]
2017-11-21 13:15:13 +00:00
Alex Voicu fb1021cc0a 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. 2017-11-21 13:15:13 +00:00
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
Alex Voicu 5e16ee0d1f 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. 2017-11-21 13:15:13 +00:00
Jenkins ca62d35d13 Merge 'master' into 'amd-master'
Change-Id: Ie37ee84b9c4f2808bd0dc2986e20feeb4449cea3


[ROCm/clr commit: c0f413a07a]
2017-11-21 04:10:37 -06:00
Jenkins c0f413a07a Merge 'master' into 'amd-master'
Change-Id: Ie37ee84b9c4f2808bd0dc2986e20feeb4449cea3
2017-11-21 04:10:37 -06:00
Jenkins 232a6cfdd0 Merge 'master' into 'amd-master'
Change-Id: Ie37ee84b9c4f2808bd0dc2986e20feeb4449cea3


[ROCm/hip commit: 619fce9daf]
2017-11-21 04:10:37 -06:00
Jenkins 619fce9daf Merge 'master' into 'amd-master'
Change-Id: Ie37ee84b9c4f2808bd0dc2986e20feeb4449cea3
2017-11-21 04:10:37 -06:00
foreman 7933dae277 P4 to Git Change 1484863 by johtaylo@johtaylo-jtincrementor2-increment on 2017/11/21 03:00:05
SWDEV-2 - Change OpenCL version number from 2540 to 2541.

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/utils/versions.hpp#2288 edit


[ROCm/clr commit: e7579ebca0]
2017-11-21 03:11:16 -05:00
foreman e7579ebca0 P4 to Git Change 1484863 by johtaylo@johtaylo-jtincrementor2-increment on 2017/11/21 03:00:05
SWDEV-2 - Change OpenCL version number from 2540 to 2541.

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/utils/versions.hpp#2288 edit
2017-11-21 03:11:16 -05:00
Rahul Garg 1b359db390 Changed function hipMemcpy_2D to hipMemcpyParam2D
[ROCm/hip-tests commit: 3d2e40a5df]
2017-11-21 12:36:24 +05:30
Rahul Garg 3d2e40a5df Changed function hipMemcpy_2D to hipMemcpyParam2D 2017-11-21 12:36:24 +05:30
Rahul Garg dc2c56c43d Changed function hipMemcpy_2D to hipMemcpyParam2D
[ROCm/clr commit: 24307fe5c4]
2017-11-21 12:36:24 +05:30
Rahul Garg 24307fe5c4 Changed function hipMemcpy_2D to hipMemcpyParam2D 2017-11-21 12:36:24 +05:30
Rahul Garg 03552f2e94 Changed function hipMemcpy_2D to hipMemcpyParam2D
[ROCm/hip commit: 9866fa250d]
2017-11-21 12:36:24 +05:30
Rahul Garg 9866fa250d Changed function hipMemcpy_2D to hipMemcpyParam2D 2017-11-21 12:36:24 +05:30
Alex Voicu 1366b2d5ae 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/clr commit: f8c1c1b38e]
2017-11-21 02:40:34 +00:00
Alex Voicu f8c1c1b38e 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. 2017-11-21 02:40:34 +00:00
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 9d088d2283 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. 2017-11-21 02:40:34 +00:00
foreman 1a0eaec2c6 P4 to Git Change 1484669 by wchau@wchau_WIN_OCL_HSA on 2017/11/20 17:33:26
SWDEV-138242 - [QR] Screen corruption when opening DVR or Radeon Settings overlay in several apps (PUBG, Dirt3, GoW4, etc)
	-  Fix the mapping entries for 10-bits channel format between the OGL surface formats (hData.format) returned by wglResourceAttachAMD function and the OCL image format.  No alpha channel is supported.

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldevicegl.cpp#8 edit


[ROCm/clr commit: d3a8bbdeb5]
2017-11-20 17:44:21 -05:00
foreman d3a8bbdeb5 P4 to Git Change 1484669 by wchau@wchau_WIN_OCL_HSA on 2017/11/20 17:33:26
SWDEV-138242 - [QR] Screen corruption when opening DVR or Radeon Settings overlay in several apps (PUBG, Dirt3, GoW4, etc)
	-  Fix the mapping entries for 10-bits channel format between the OGL surface formats (hData.format) returned by wglResourceAttachAMD function and the OCL image format.  No alpha channel is supported.

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldevicegl.cpp#8 edit
2017-11-20 17:44:21 -05:00
Alex Voicu 98ea26e613 Clean-up some remaining noise in program_state.cpp.
[ROCm/clr commit: 24f8a93ff7]
2017-11-20 22:41:46 +00:00
Alex Voicu 24f8a93ff7 Clean-up some remaining noise in program_state.cpp. 2017-11-20 22:41:46 +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 1824fb7698 Clean-up some remaining noise in program_state.cpp. 2017-11-20 22:41:46 +00:00