Commit Graph

230 Commits

Author SHA1 Message Date
agodavar ac317d0029 Enable tests hipTestDeviceSymbol,hipTestConstant and p2p_copy_coherency on hip-vdi
SWDEV-225266: [HIP-VDI] HIP-VDI disabled tests (p2p_copy_coherency.cpp)
SWDEV-225388: hipTestDeviceSymbol.cpp & hipTestConstant.cpp failed to build on hip-vdi

For hipTestDeviceSymbol.cpp & hipTestConstant.cpp tests:
Currently "__HIP_VDI__" flag is enabled in CMakeLists.txt, but when application is compiled with hipcc,  
__HIP_VDI__ is not defined to differentiate if compiled for VDI/HCC for headers.

For ./src/runtimeApi/memory/p2p_copy_coherency.cpp:
Fixed compilation issue to include only when compile for HCC runtime "<hc_am.hpp> not found"
Currently test is disabled to run on all platforms. When validated on multi-GPU machine,
memcpy between multiple GPUs via GPU synchronization is not working on hcc and vdi path.
Need to validate on nvidia machine to know if test is valid. Disabled GPU synchronization test for now.

For ./src/runtimeApi/module/hipModuleTexture2dDrv.cpp:
updated test to generate tex2d_kernel.code object in build directory. Currently ctest looks for it in build directory.

Change-Id: I629d395a919c2440d921422716944c7940ed6010


[ROCm/clr commit: ae465bc338]
2020-03-04 10:07:09 -05:00
Payam b6f311794e updated hipcc to include HSA path for clang builds as well
Change-Id: Icaaa68fdbe79fb16e4e9fedd420460f1479d7fe0


[ROCm/clr commit: 87cd9451f2]
2020-02-13 16:48:24 -05:00
mhbliao 87056623e9 [hip] Cleanup compiler wrapper for HIP-Clang. (#1847)
[ROCm/clr commit: 8343d7c9aa]
2020-02-07 13:28:26 -08:00
Michael LIAO 0a97bed2bd [hipcc] Skip warning on gfx000.
- The known target checking should skip `gfx000` as well as it won't be
  used in real compilation command formation. The avoid generating
  annoying warning on `gfx000`.


[ROCm/clr commit: 59bd608bfe]
2020-02-06 17:09:14 -05:00
Siu Chi Chan 63b6eb1345 Enable code object v3 codgen when compiling with HCC (#1836)
Change-Id: I590c05a418cc37ec247b89124cef17a7fe8b27e2

[ROCm/clr commit: 713702eebc]
2020-02-05 20:56:33 +05:30
kpyzhov 02536516bc hipcc script: Refined device selection; added gfx1011 target. (#1821)
[ROCm/clr commit: 951d7d4ba6]
2020-02-04 08:56:16 +05:30
paulfreddy c9c4645328 Changes for multiple ROCm installation (#1771)
* FBA-29, FBA-69, multiple rocm support, shared library conflicts
Changes to resolve:
1) Multiple rocm release installation support
2) Multiple rocm shared lib conflicts
3) Add the so versioning also

[ROCm/clr commit: c5ed5c71a3]
2020-01-21 14:17:35 +05:30
Rahul Garg 32139b7465 Fix hipcc warning related to hipVersion (#1767)
* Fix hipcc warning related to hipVersion
* Rename hipVersion.h to hip_version.h
* Remove HIP_VERSION splitting
* Update .gitignore
- Ignore generated include/hip/hip_version.h
- Removed some stale entries
- Added executables from samples/1_Utils/*/ for consistency with bin/ entries.

[ROCm/clr commit: 3fe1695c3a]
2020-01-06 12:33:23 +05:30
Sarbojit2019 4d2ee146e1 Change to generate hipVersion.h (#1726)
HIP_VERSION_MAJOR, HIP_VERSION_MINOR, HIP_VERSION_PATCH and HIP_VERSION pre-processor macros are now defined in hipVersion.h instead of being set by hipcc.

[ROCm/clr commit: 4fd77f8336]
2019-12-30 12:44:24 +05:30
Rahul Garg 30759e7c9b Merge pull request #1550 from yxsamliu/new-launch
Add -fhip-new-launch-api to hipcc for HIP/VDI

[ROCm/clr commit: 07eed1e5bf]
2019-10-17 19:07:32 -07:00
Rahul Garg 714314fa66 Revert "hipcc defaults to code object v3 (#1298)"
This reverts commit e5a2ba9602.


[ROCm/clr commit: 446718f990]
2019-10-17 13:27:28 -04:00
kpyzhov 19f22b468b [hipcc] Temporary add -D_OPENMP to clang options to workaround cmake issue (#1540)
* Temporary add -D_OPENMP to clang options in hipcc to allow using CMake OpenMP detection with hip-clang (until updated CMake version is available).

[ROCm/clr commit: 9773f94c71]
2019-10-16 10:51:28 +05:30
Yaxun (Sam) Liu abfe4248da Add -fhip-new-launch-api to hipcc for HIP/VDI
[ROCm/clr commit: 739530d53b]
2019-10-15 21:47:33 -04:00
srinivamd ad8e82ca0b remove dependencies on /opt/rocm path (#1379)
* remove hard coded dependencies on /opt/rocm path

[ROCm/clr commit: 706e4498e3]
2019-10-10 19:56:55 +05:30
Maneesh Gupta e5a2ba9602 hipcc defaults to code object v3 (#1298)
Change-Id: I272ec61090fa504d631fb54371a73dd6fd17a167

[ROCm/clr commit: c8f38a139a]
2019-10-04 13:35:21 +05:30
Yaxun (Sam) Liu 0a81b64a19 Do not change opt level for -g for hip-clang (#1369)
Currently hipcc uses -O3 for hip-clang by default but uses -O0 if -g is used. This
causes surprise for users since -g should not affect default opt level.

[ROCm/clr commit: 19a9b15306]
2019-08-29 01:03:11 +00:00
Sarbojit2019 45c928dbba [hipcc] Fix for uninitialized variables on nvcc path
Fixes #1186

[ROCm/clr commit: f106375a34]
2019-08-20 12:06:22 +00:00
Maneesh Gupta c6c0b9ef9f Bump HIP version (#1311)
- Match HIP version with upcoming ROCm version
- Add githash to version string

[ROCm/clr commit: 1884359940]
2019-08-09 12:13:29 +00:00
Maneesh Gupta af006dcf0e Merge pull request #1305 from ROCm-Developer-Tools/fix-hip-vdi-include-clang
Fix HIP-VDI using incorrect include files

[ROCm/clr commit: 268d82aefd]
2019-08-08 08:28:20 +00:00
Aaron Enye Shi 92a468a647 Fix HIP-VDI using incorrect include files
When HIP-VDI depends on an llvm-amdgpu package, the include clang directory is not properly assessed.

[ROCm/clr commit: 3750b2cf42]
2019-08-07 16:59:17 -04:00
David Rohr 324995e472 Treat .cxx files like .cpp files
[ROCm/clr commit: a22119d381]
2019-08-07 19:11:35 +02:00
Yaxun (Sam) Liu 05b71135e9 Fix -std=c++14 for windows
[ROCm/clr commit: c1dc675e3d]
2019-07-31 16:36:47 -04:00
Aaron Enye Shi 73af1ac4bd Add GFX908 specific changes to HIP (#1229)
* Add GFX908 specific for HIP

* Fix missing __halfTest in hipTestNativeHalf


[ROCm/clr commit: 8c82f9db77]
2019-07-24 07:51:17 +00:00
Yaxun (Sam) Liu 682dcddbbd Add amdgpu targets gfx1010 and gfx1012 (#1211)
[ROCm/clr commit: 4b5061e13f]
2019-07-12 03:13:35 +00:00
Michael LIAO 43d194a641 [hipcc] Revise include path calculation.
- Once HIP_VDI_HOME is defined but HIP_CLANG_INCLUDE_PATH is not,
  calculate it directly without HIP_CLANG_PATH is defined or not;
  Otherwise, we may leave HIP_CLANG_INCLUDE_PATH undefined, if clang is
  not installed following the official way (so far, HIP-Clang breaks
  that), we may leave HIP_CLANG_INCLUDE_PATH undefined before its uses.


[ROCm/clr commit: c3604d3120]
2019-06-14 13:35:00 -04:00
Yaxun Sam Liu 101cb68a36 Fix default HIP_VDI_HOME
There is soft link /opt/rocm/bin/.hipVersion, therefore when hipcc is executed
as /opt/rocm/bin/hipcc, it will set HIP_VDI_HOME to /opt/rocm, which is
incorrect. Check ../lib/bitcode instead to identify HIP_VDI_HOME.


[ROCm/clr commit: 154765df88]
2019-05-31 23:58:59 -04:00
Konstantin Pyzhov ef65d67aa0 Fixed setting HIP_CLANG_PATH on Windows.
[ROCm/clr commit: 332b19023d]
2019-05-28 09:38:17 -04:00
Yaxun (Sam) Liu 9ec62afb47 Fix hipcc for hip-clang. (#1143)
* Fix hipcc for hip-clang.

If there is -g, do not add -O3 by default.
If HIP_VDI_HOME is not set, set HIP_VDI_HOME based on hipcc directory for HIP/VDI runtime.
For HIP/VDI runtime, set HIP_CLANG_PATH and DEVICE_LIB_PATH based on HIP_VDI_HOME only if they exist.

This allows using HIP/VDI runtime with hip-clang installed at /opt/rocm/llvm and device lib installed
at /opt/rocm/lib.

* Fix HIP_VDI_HOME for hipcc called from /opt/rocm/bin


[ROCm/clr commit: 34b1c6c5b2]
2019-05-28 09:40:34 +05:30
Maneesh Gupta 0f2b9e7b30 Merge pull request #1136 from yxsamliu/fix-rdc
Fix device lib path for hip-clang.

[ROCm/clr commit: 68d30cd7e4]
2019-05-24 14:16:30 +05:30
Yaxun Sam Liu beb0031f4a Fix device lib path for hip-clang.
We now always need device lib path when compiling and not need it at linking.


[ROCm/clr commit: 6360570532]
2019-05-23 15:11:02 -04:00
Aaron Enye Shi f4fa9d55f9 Fix hipcc exit code when failing
[ROCm/clr commit: 303ba600d6]
2019-05-16 20:36:58 +00:00
Michael LIAO fb427976d7 [hipcc] Repace --rpath with --rpath-link
- With `--rpath`, app's RUNPATH is set to the temporary library path
  during build. Instead, `--rpath-link` should be used to leave RUNPATH
  untouched. User should set LD_LIBRARY_PATH or system ld.so.conf to
  proper setting.


[ROCm/clr commit: 92f90c3651]
2019-04-29 16:01:16 -04:00
Aaron Enye Shi f8d108a815 Revert "Use COMgr to read Kernel Args Metadata (#1006)"
This reverts commit 10048a5631.


[ROCm/clr commit: 235c6877c8]
2019-04-26 16:04:56 -04:00
Aaron Enye Shi 10048a5631 Use COMgr to read Kernel Args Metadata (#1006)
* Add CMAKE dep to amd_comgr

* Use COMGR for read_kernarg_metadata in COV2

* Do not assume kernargs exist

* Add proper metadata destroy cleanup

* Use a process function for easier destroy

* Remove old read_kernarg_metadata

* Clean up HCC, prints, names

* Use COMGR in CMAKE by default

* Move metadata lookup for keyword values into helper

* Remove C string usage for lookup_keyword_value

* Guard COMGR for non-NVCC path

* Add hip_hcc dependency on comgr package

* Add lifetime to metadata nodes

* Find COMGR config file for amd_comgr target

* Move set_active data earlier


[ROCm/clr commit: 2c80975e9c]
2019-04-16 08:34:39 +05:30
Yaxun (Sam) Liu f6151a55fd hip-clang: fix hipcc options
Use -O3 for default optimization level.
Fix --hip-device-lib-path for warnings about unused option.


[ROCm/clr commit: 419eeb4fe0]
2019-04-09 22:31:13 -04:00
Yaxun (Sam) Liu 40cf556b82 hip-clang: add include path for hsa headers
[ROCm/clr commit: 98642129cc]
2019-04-09 15:01:50 -04:00
Yaxun Sam Liu d52780d6f9 Change HIP dll name to amdhip64.dll on Windows
[ROCm/clr commit: 55f4c416a0]
2019-03-19 16:27:18 -04:00
Yaxun Sam Liu 169bfb6b75 Revert "hipcc should consume -mcode-object-v3 flag"
This reverts commit ac4b2b03ac.


[ROCm/clr commit: b40d9c7849]
2019-02-28 11:21:47 -05:00
Yaxun Sam Liu 89721c8ce8 Revert "Change code-object flag to only HIP-Clang"
This reverts commit 1e483af21b.


[ROCm/clr commit: 9002c7d09d]
2019-02-28 11:20:04 -05:00
Yaxun Sam Liu 768d00f5e7 Revert "Consume the code obj args to prevent duplicates"
This reverts commit 0e1fc751ea.


[ROCm/clr commit: 510590ac1d]
2019-02-28 11:19:35 -05:00
Aaron Enye Shi 0e1fc751ea Consume the code obj args to prevent duplicates
[ROCm/clr commit: 3a57510fbb]
2019-02-19 17:02:27 +00:00
Maneesh Gupta 6ed576713f Initialize HIP_LIB_PATH on hcc path
Change-Id: I8f392fffcd6a3714c20cb17e876dbaad999c33a0


[ROCm/clr commit: 2a575aeda6]
2019-02-13 09:57:21 +05:30
Maneesh Gupta 8c03ea0bf5 Merge pull request #910 from aaronenyeshi/hip-code-obj-v3-passing
hipcc should consume -mcode-object-v3 flag

[ROCm/clr commit: cc7defa141]
2019-02-13 08:58:19 +05:30
Aaron Enye Shi 1e483af21b Change code-object flag to only HIP-Clang
[ROCm/clr commit: 2a956540ee]
2019-02-11 17:18:12 +00:00
Maneesh Gupta 455109103e Merge pull request #911 from lmoriche/hip_clang
Allow HIP_LIB_PATH to be overriden at the command line. Use HIP_LIB_P…

[ROCm/clr commit: b1570ef592]
2019-02-11 11:26:39 +05:30
Maneesh Gupta 97e946911d Merge pull request #903 from yxsamliu/win2
Fix hipcc and hip_vector_types.h for windows

[ROCm/clr commit: 96407ef9ec]
2019-02-11 11:24:03 +05:30
Laurent Morichetti 0229c82be7 Allow HIP_LIB_PATH to be overriden at the command line. Use HIP_LIB_PATH for rpath instead of HIP_PATH/lib
[ROCm/clr commit: e410ee013c]
2019-02-08 13:50:13 -08:00
Aaron Enye Shi ac4b2b03ac hipcc should consume -mcode-object-v3 flag
[ROCm/clr commit: 8062305f0b]
2019-02-08 18:29:14 +00:00
Aaron Enye Shi b273897de1 Add hipInfo path for VDI build
[ROCm/clr commit: b07fab0727]
2019-02-07 22:05:14 +00:00
Yaxun Sam Liu 6d596cf51b Fix hipcc and hip_vector_types.h for windows
Disable linux specific compilation and linking options for windows.

In hip_vector_types.h, hip-clang needs HIP's own implementation for vector types even
on windows. MSVC specific implementation is for building runtime itself, which is compiled
by MSVC.


[ROCm/clr commit: d0fc2d0f99]
2019-02-07 11:07:50 -05:00