Commit Graph

13474 Commits

Author SHA1 Message Date
Christophe Paquot cf6df62b3a Merge "cherrypick from master branch" into amd-master-next 2020-04-24 11:48:18 -04:00
Yaxun Liu 040ca11925 Merge "Enable template max and min for HIP-Clang" into amd-master-next 2020-04-24 11:44:49 -04:00
Tao Sang cf6345d7c7 Merge "Add Performance/memory/hipPerfMemMallocCpyFree" into amd-master-next 2020-04-24 11:32:47 -04:00
Matt Arsenault 350d54e198 Don't use include_directories for ROCR includes
Use the modern cmake, target specified method.

Change-Id: Icd7196bfccb85f255bbc01bc87c6667d961bb236
2020-04-24 11:05:40 -04:00
Matt Arsenault ff12016c7b Use target_compile_definitions for HSA vs. PAL device macros
Change-Id: I7e1240cb4d32ce86948814d727a516025ee976fa
2020-04-24 11:05:16 -04:00
Matt Arsenault 815198bec9 Cleanup libelf build
Use target specific forms for define/include. Don't set
CMAKE_CXX_FLAGS for the standard, which is already implied from the
parent build.

Change-Id: I4000893376d6685e9889b66ad8451fc493020272
2020-04-24 11:04:52 -04:00
Matt Arsenault ec62f9b8de Unscreamake some cmake functions
This was already using the new lowercase style in most places.

Change-Id: I7ed04a3652c932581a2897f2fee79d79aa732f8e
2020-04-24 11:04:21 -04:00
Matt Arsenault 3c2e0f6155 Remove leftover cmake debug printing
Change-Id: I886b21717eadab6b4365ddaff063fbcd37300aa8
2020-04-24 11:03:37 -04:00
Matt Arsenault 83455f36c5 Modernize cmake usage for finding amd_comgr
Don't use find_path on the header, it's redundant with the interface
include directories on the imported target. Use the target specific
forms for including and linking it.

Change-Id: I3923143c992888ee7d5ee1130084ac2e5eaa0f3a
2020-04-24 11:03:27 -04:00
Matt Arsenault a36f19df51 Don't use CMAKE_SOURCE_DIR
This is almost never the correct thing to use since it breaks adding
this as a subproject build in a larger build. Switch to refer to
CMAKE_CURRENT_SOURCE_DIR, which is equivalent in a standalone build.

Change-Id: Ib8dbbc0668491f4227389b9a5b27da770b3bc5ce
2020-04-24 11:02:52 -04:00
Michael Hong Bin Liao 17e9c63708 Merge "[vdi] Fix texture reference sample." into amd-master-next 2020-04-24 10:30:38 -04:00
Michael Hong Bin Liao 2e61683b33 Merge "[vdi] Fix hang due to recursive locking." into amd-master-next 2020-04-24 10:30:26 -04:00
Yaxun (Sam) Liu 1013e4eca8 Enable template max and min for HIP-Clang
This change is required by AMDMIGraphX.

It was for HCC only. HIP-Clang also needs it for __fp16 since AMDMIGraphX uses it.

Change-Id: Id49322b7b89ef799accdf6b47627a6fce51d1ab5
2020-04-24 09:51:17 -04:00
Paul Fultz II 9227b08458 cherrypick from master branch
75a5088446
727c9f77d8

These are needed by MIOpen and rocBLAS.

Add __HIP_PLATFORM_HCC__ to hip::host target (#2029)

Fix hip-config.cmake for CMAKE_CXX_COMPILER=g++ (#2035)

* Fix hip-config.cmake for CMAKE_CXX_COMPILER=g++

* Add inlineall option to hip::device in hip-config.cmake

Change-Id: Ib51f82d0b9e38d2137df65c940592413e22ba07a
2020-04-24 09:32:02 -04:00
Chauncey Hui bb348a463d SWDEV-2 - Change OpenCL version number from 3129 to 3130 2020-04-24 03:00:03 -04:00
Tao Sang 33d7005b10 Add Performance/memory/hipPerfMemMallocCpyFree
Change-Id: Id1ac415f85028da3e9517c2226764bcb4acec1b1
2020-04-23 23:49:56 -04:00
Michael LIAO b469e5c573 [vdi] Fix texture reference sample.
- The driver code should not re-define `tex` again as it's already
  defined in the kernel code. Eventually, the driver code should be as
  regular C++ code instad of HIP code.

Change-Id: I8c7cab204b98990619d6e7109b990d7089ea9261
2020-04-23 23:41:56 -04:00
Michael LIAO c56a3ca63e [vdi] Fix hang due to recursive locking.
- Declare recursive lock for global function map.

Change-Id: I3e792e21688c980343c4fd1c61dcad97f7a890cd
2020-04-23 23:32:56 -04:00
kjayapra-amd 92c63384cb SWDEV - 231874 - Do Dword aligned memset if the total size aligns.
Change-Id: Id05db4cfd9c43b2cffa3cec8b02f1cd07f340dd6
2020-04-23 21:08:50 -04:00
Vlad Sytchenko bfa363d00c Make sure to zero out all the unset texture fields
These might contain garbage causing the runtime to incorrectly parse the state of the texture references.

Change-Id: I93c726fa30b580b3e14c50ac939f3c71b0d1c8d9
2020-04-23 16:38:52 -04:00
German Andryeyev 89133a7301 SWDEV-232807
[ROCm][TCT][HIP] cooperative stream test case is failing.

Make sure lockXfer() in the blit manager returns a valid value.
Port the latest PAL backend logic into the ROCr backend.
This change doesn't fix the issue, reported in the ticket.

Change-Id: I54101a824f49a2dcfbbf5414cb5b3af41745306d
2020-04-23 15:01:02 -04:00
Michael Hong Bin Liao b70dac2557 Merge "[hip] Fix typos." into amd-master-next 2020-04-23 13:32:09 -04:00
eshcherb 6cb57ee64a fix pointers format (#2037)
* fix pointers format

* fix pointers format - cleanup

* fix pointers format - fix
2020-04-23 21:54:51 +05:30
Yaxun (Sam) Liu 5abcda3ab7 Fix hip-config.cmake for CMAKE_CXX_COMPILER=g++ (#2035)
* Fix hip-config.cmake for CMAKE_CXX_COMPILER=g++

Change-Id: I84ae83a5d223853706dd36834b7962ffe9573c1f

* Fix HIP_CXX_COMPILER

Change-Id: I4e2523b560113420af1ab877a0bc48ca2e9e957a

* Fix hip-config.cmake

Change-Id: Ida4ef8f40fed83d5f659a9a9835b1f521cb6a374

* Add inlineall option to hip::device in hip-config.cmake

Change-Id: Ib51f82d0b9e38d2137df65c940592413e22ba07a
2020-04-23 21:51:54 +05:30
Aaron Enye Shi 17e439e572 extractkernel obj dump args to use double dashes (#2034)
More recent llvm-objdump has changed disassemble and mcpu arguments to require double dashes.
2020-04-23 21:51:33 +05:30
Paul Fultz II 445953aa94 Add __HIP_PLATFORM_HCC__ to hip::host target (#2029) 2020-04-23 21:51:02 +05:30
Maneesh Gupta f2e1118d7a Merge in the rocclr based hip runtime (#2032)
* Merge master-next changes in master (include vdi development in master branch)
2020-04-23 09:12:06 -07:00
Chauncey Hui a3f163be6a SWDEV-2 - Change OpenCL version number from 3128 to 3129 2020-04-23 03:00:03 -04:00
Evgeny Shcherbakov e8d64b509e Merge "cleanup" into amd-master-next 2020-04-22 23:28:22 -04:00
Michael LIAO a353df6b36 [hip] Fix typos.
Change-Id: I9d85d0e70033d144dbd4d61cb434ffbe023af8c0
2020-04-22 16:44:54 -04:00
Tao Sang 85abd8f028 Fix hip_get_devices failure in lammps
Support hipDeviceAttributeIntegrated in hipDeviceGetAttribute() with hip-vdi rt

Change-Id: Ie5ba81222af3554a843c184ae75af7f369a3c24b
2020-04-22 15:16:59 -04:00
Evgeny b05e54bf84 cleanup
Change-Id: Ia0ee0e4cab2ee8eaa9931024681d0db5b2802594
2020-04-22 13:42:45 -05:00
Michael LIAO 97f55b5c7f [vdi] Add device assertion support.
- Once device assertion occurs, abort the host execution as well.
- TODO: This's the initial support. As we need to drain hostcall queue
  to ensure device assertion message being flushed out, hostcall
  listener needs an interface to explicitly drain its queue.

Change-Id: I8a04400aa7109bfd054ae5777c41a4abbf0db4a9
2020-04-22 10:03:55 -04:00
Chauncey Hui 43a8e929a2 SWDEV-2 - Change OpenCL version number from 3127 to 3128 2020-04-22 03:00:03 -04:00
Michael LIAO 2c1933e0f3 [hip] Generate assertion message in assertion.
Change-Id: Ie66f6563e8728fd0e21cf22dcc6619e4a0e5c28d
2020-04-21 16:44:40 -04:00
Matt Arsenault d4a447967e Use cmake features to set c++ version
Change-Id: I2649cdca5bc68298371f770a7a624a21db3f4137
2020-04-21 16:01:30 -04:00
Tao Sang 8d63204887 Merge "support hipLaunchParm test with static lib of hip-vdi rt" into amd-master-next 2020-04-21 15:54:46 -04:00
Matt Arsenault 356c3bf5b8 Update cmake project name
Change-Id: If4bdf15ca3774148c0c415e8cd950efa310ef62f
2020-04-21 15:23:06 -04:00
Matt Arsenault fc4afbd0f9 Use cmake features to set C++ version
Change-Id: Icf5dcd781b8fecc7a39117f3c6dee97dcba9dcca
2020-04-21 15:22:50 -04:00
Tao Sang b52873ff98 Add perfDispatch tests into hip direct_tests
Port perfDispatch tests from OpenCL into hip direct_tests

Change-Id: I9f8362636e329d2d0a434c4f012ccc46a524c746
2020-04-21 14:00:27 -04:00
Tao Sang d27880ac39 support hipLaunchParm test with static lib of hip-vdi rt
Let hipMalloc() be called in main() so that global variable can be initialized.

Change-Id: I9aa1f0a0bb4fa0825d10af0b58c843e7b928e9a3
2020-04-21 13:55:42 -04:00
Michael LIAO 441284841d [vdi] Refactor texture/surface reference support.
Change-Id: I8014d82aae7139ef5f95e4b50c4fc6da200dbc9d
2020-04-21 11:56:48 -04:00
German Andryeyev 21840ac6a0 SWDEV-231579 - [hipclang-vdi-rocm][perf]
- HIPPerfDispatchSpeed disparity between HIP/HCC vs HIP/VDI
Insert a wait marker command in the default stream only when
HIP has pending operations on other async streams

Change-Id: I68660a54867fab7571ba57eb1df5feb1bca1c61a
2020-04-21 10:05:26 -04:00
Chauncey Hui a8150cfe39 SWDEV-2 - Change OpenCL version number from 3126 to 3127 2020-04-21 03:00:03 -04:00
kjayapra-amd b3308f7674 SWDEV-229480 - Improve error messages in HIP Layer.
Change-Id: I054b979d3aa6cf6ed4ca14a9393bdcba757772ff
2020-04-20 21:23:52 -04:00
Payam 0b0d9c27cb adding License file
Change-Id: I21062736fe9c9b6e6c0595108421e90e6f31d8d9
2020-04-20 16:12:32 -04:00
Tao Sang 32130f8ec3 Solve issues with hip-vdi runtime static lib
1.Combine libamdhip64_static_base.a and libamdvdi_static.a into libamdhip64_static.a.
2.Let hipcc use -use-staticlib to link libamdhip64_static.a.
3.Add some samples for static lib.
4.Fix compiling failure of code object.

Change-Id: Ic8c95228eb139058da8b5d66ba8439486154ca6f
2020-04-20 15:37:02 -04:00
Pruthvi Madugundu 8ba1527661 Make CMAKE_SHARED_LINKER_FLAGS appendable
Signed-off-by: Pruthvi Madugundu <pruthvi.madugundu@amd.com>
Change-Id: I3c23223270976b8746d5b4debf4d846ae0aa4c6f
2020-04-20 13:51:05 -04:00
Pruthvi Madugundu bbcfe78d1c Merge "Removing ld.so.conf entry for Opencl package" into amd-master-next 2020-04-20 13:50:41 -04:00
Chauncey Hui 54fc281d6c SWDEV-2 - Change OpenCL version number from 3125 to 3126 2020-04-20 03:00:03 -04:00