Commit Graph

5350 Commits

Author SHA1 Message Date
Icarus Sparry 64f8ff5e70 Fix runtime failure on windows
Signed-off-by: Icarus Sparry <icarus.sparry@amd.com>
Change-Id: I6c991a943e04ef29eff2905becbed0038c3b8ab9
Signed-off-by: Icarus Sparry <icarus.sparry@amd.com>
2020-05-11 17:30:47 -04:00
Icarus Sparry 0936d9d64d Merge "Correct quoting of arguments" into amd-master-next 2020-05-11 11:39:47 -04:00
Icarus Sparry a4f01ffca6 Correct quoting of arguments
The hipcc script takes arguments and uses this to build up a new
command. Characters which are special to the shell need to be quoted
to prevent them being interpreted.

In particular adding
     --Wl,--enable-new-dtags -Wl,--rpath,'$ORIGIN:$ORIGIN/../lib'
to the command should pass quoted dollar signs into the resulting
string so the shell passes them on, rather than substituting the
values.

The arguments are processed in a conventional loop, but can be altered
during the course of the loop, and also by linker response files.

Tested by running
  HIPCC_VERBOSE=7 HIP_COMPILER=clang hipcc --cxxflags \
      fred.c -Wl,,--rpath,'$ORIGIN:$ORIGIN:/../lib'
and observing "-Wl,--rpath,\$ORIGIN\:\$ORIGIN\:..\/lib" in the
displayed hipcc-cmd output (and ignoring the errors due to rocm not
being installed)

Change-Id: I26b62f09ff3518cceeb85fa8823bb12a95c1c78e
Signed-off-by: Icarus Sparry <icarus.sparry@amd.com>
2020-05-10 18:16:48 -04:00
Vlad Sytchenko fec51e85b0 Correct HIP_FUNC_ATTRIBUTE_NUM_REGS query
Change-Id: I526cc7871c690260df0fa8c1b3b4b15fbc5af219
2020-05-09 12:42:30 -04:00
Christophe Paquot 507f6bb0c3 Merge "Don't add a null command to waitList in hipMemcpy" into amd-master-next 2020-05-08 17:01:38 -04:00
Christophe Paquot 3ca2d1e6a9 Don't add a null command to waitList in hipMemcpy
SWDEV-235345

Change-Id: Ib1abd0ba6414d081891a9f5209df083c45734aee
2020-05-08 12:43:41 -07:00
Vlad Sytchenko 1b1c032e9f Correct HIP_FUNC_ATTRIBUTE_MAX_THREADS_PER_BLOCK query
We should be returning the max workgroup size calculated by the compiler.

Change-Id: If86590efbb9b291f470bdbe87e5df992e661c539
2020-05-08 14:36:47 -04:00
Vlad Sytchenko a373538d72 Fix confusion in hipFuncGetAttribute()
Cuda shared == OpenCL local

Cuda local == OpenCL private

Change-Id: I5a204945ecde35919b9e9def20bbb2662fffea2b
2020-05-08 14:36:36 -04:00
Matt Arsenault 6262ce482f Don't add llvm includes to rocclr build
There are no llvm includes here.

Change-Id: I0567c6e47e717580819f3854782ba08501bd069d
2020-05-08 12:24:49 -04:00
Anusha Godavarthy Surya 39e9205044 Merge "SWDEV-233950:link to /opt/rocm/hip/lib/cmake left behind during uninstall" into amd-master-next 2020-05-08 12:12:06 -04:00
agodavar a9bc94129b SWDEV-234447:Fix error Use of uninitialized value in concatenation (.)
Change-Id: Ia6f8d23f100826438f152c175d10ac3096ee024e
2020-05-08 12:07:24 -04:00
Matt Arsenault 73bc14ec49 Don't write generated version.h to source directory
Change-Id: Ib4e7c3171cd227725ae35fed66167df528a4c431
2020-05-08 10:59:28 -04:00
Aaron Enye Shi 5fbae827c2 SWDEV-234954 - Fix hipconfig on Windows
Before setting the HIP_RUNTIME and HIP_COMPILER variables, first check the environment if these are set. We should prioritize the environment settings. For windows, it will be set, and also explicitly call perl when invoking hipconfig.

Change-Id: I89ad267285239e6d8a897dc681c4af5906e7b9d8
2020-05-08 13:27:36 +00:00
agodavar 7a32fc43a6 SWDEV-233950:link to /opt/rocm/hip/lib/cmake left behind during uninstall
Change-Id: Ideb76b73916881469e39b7a0a4d68d7ec098b4a8
Signed-off-by: agodavar <Anusha.GodavarthySurya@amd.com>
2020-05-08 07:36:28 -04:00
Sarbojit Sarkar 3612851809 Enabling hipGetDeviceFlags required in [SWDEV-229170]
Change-Id: I998d37e5847f9651345554bada86df6fce86d1eb
2020-05-08 01:37:23 -04:00
Matt Arsenault af4692f838 Fix generated hip_prof_str.h install again
Change-Id: I92ea4bedbcdc92974998c00ca7f0c00098791cb5
2020-05-07 12:40:39 -04:00
Aaron En Ye Shi 73e759eab0 Merge "Fix missed VDI names in hip-on-rocclr" into amd-master-next 2020-05-07 12:30:51 -04:00
agodavar 0231de3164 Fix hip-config.cmake build error in rocBLAS
Change-Id: I097f0dac0f67bfc22e9991350bf63bc7bfa8b269
2020-05-07 12:24:20 -04:00
Aaron Enye Shi 1c1be71b63 Fix missed VDI names in hip-on-rocclr
Change-Id: I830feb37a043656136648e92a0c6f1eaae8402d7
2020-05-07 08:37:28 -04:00
Tao Sang 861d07fbd3 Merge "Support performance tests" into amd-master-next 2020-05-07 07:15:09 -04:00
Rahul Garg 789cc01b58 Merge "Remove HIP_MARKER left overs due to HIP PR 2032" into amd-master-next 2020-05-07 01:36:57 -04:00
Anusha Godavarthy Surya 137440ac72 Merge "SWDEV-233749 Added support for parallel build and link" into amd-master-next 2020-05-07 00:29:24 -04:00
Rahul Garg 819677825f Remove HIP_MARKER left overs due to HIP PR 2032
Change-Id: Ieae68dd3b12c92b1d6830619ca4c6ae43c400225
2020-05-06 20:26:18 -04:00
Christophe Paquot 78df96024d Merge "SWDEV-232464 - Need to initialize image with ptr passed since they can pass image not of type __ClangOffloadBundler." into amd-master-next 2020-05-06 16:42:50 -04:00
Christophe Paquot 076c2ffadf Merge "Skip iHipWaitActiveStreams if stream is NonBlocking" into amd-master-next 2020-05-06 16:32:51 -04:00
agodavar 56691fe7e6 SWDEV-233749 Added support for parallel build and link
Change-Id: Id227ea1fe7574612c33a8e6d91fc59a29490a35f
2020-05-06 14:54:39 -04:00
kjayapra-amd 5e91bee221 SWDEV-232464 - Need to initialize image with ptr passed since they can pass image not of type __ClangOffloadBundler.
Change-Id: I2c50042220a0230bc445ed21728f114a229c53e1
2020-05-06 14:25:43 -04:00
Tao Sang 6e972dd3bb Support performance tests
Support performance tests while direct tests commands keep unchanged.
To build performance tests, run "make build_perf".
To run all performance testis, run "make perf".
To run specific tests, for example, run
/usr/bin/ctest -C performance -R performance_tests/perfDispatch --verbose
To run individual test, for example, run
performance_tests/memory/hipPerfMemMallocCpyFree

Change-Id: I168c1b9ef1ec21b392d48648d0c71e8fbd37d57b
2020-05-06 14:06:07 -04:00
Christophe Paquot f0b49d0560 Skip iHipWaitActiveStreams if stream is NonBlocking
SWDEV-234484

Change-Id: I279bdc8485d8218e0aaa89d094c08a84f002a608
2020-05-06 10:36:53 -07:00
Matt Arsenault bb6922b8a3 Don't use relative include path
The header base path is already in the include set.

Change-Id: Id83abaa921d720ae103e3281161b875fcf84493d
2020-05-06 11:59:39 -04:00
Aakash Sudhanwa 6f86a74018 rocclr/CMakeLists.txt: Fixing unresolved merge conflict
Change-Id: I09b9a955b0f1ece8d278112a22bc8aef31b57258
Signed-off-by: Aakash Sudhanwa <Aakash.Sudhanwa@amd.com>
2020-05-06 07:24:25 -07:00
Payam c5f76c3de3 name change vdi to rocclr
Change-Id: I06d198bbb4a499e153b290b73a92afed3553b252
2020-05-06 09:14:30 -04:00
Karthik Jayaprakash b1e13d8af2 Merge "SWDEV-229840 - Fixing compilation error with right var name." into amd-master-next 2020-05-05 18:17:22 -04:00
Yaxun Liu 3659399d68 Merge "Fix hipcc for -E" into amd-master-next 2020-05-05 18:00:49 -04:00
kjayapra-amd 18b19e0324 SWDEV-229840 - Fixing compilation error with right var name.
Change-Id: I9f5278638271c384874004eb17085d29ca14ec3a
2020-05-05 14:59:24 -04:00
kjayapra-amd 8f53157057 SWDEV-209747 - Add compiletime variable DEV_LOG_ENABLE
Change-Id: Ie8ff8abafa6b5e0f83209da42778688a047562c3
2020-05-05 14:48:55 -04:00
Yaxun (Sam) Liu 09bcd2e378 Fix hipcc for -E
-E is for preprocessing only, which should be compile only.

This is required by enabling sccache.

Change-Id: Ia0a0acb6a04abd03a9cb5b3c13cf7446837f37b4
2020-05-05 14:30:25 -04:00
Aaron En Ye Shi de4c5c20aa Merge "Make HIP C compliant" into amd-master-next 2020-05-05 13:54:24 -04:00
Christophe Paquot 40ad358117 Merge "SWDEV-234029 - Remove module from module_map_ @ hipModuleUnload" into amd-master-next 2020-05-05 12:56:51 -04:00
Rahul Garg 60c34fbd4d Make HIP C compliant
Change-Id: Ic2fa650675e68200c841ce3db622da836b169f33
2020-05-05 12:49:40 -04:00
Karthik Jayaprakash 251a087eab Merge "SWDEV-232464 - Memory Map modules loaded via file from hipModuleLoad" into amd-master-next 2020-05-05 09:20:14 -04:00
German Andryeyev 04c321bd7a Merge "Avoid null stream allocation in hipFree" into amd-master-next 2020-05-05 08:23:38 -04:00
kjayapra-amd ea7b96194f SWDEV-234029 - Remove module from module_map_ @ hipModuleUnload
Change-Id: Ic01fdb88c658c68298bd51cab2da21dc3ff0e1f7
2020-05-04 20:05:42 -04:00
Aaron En Ye Shi 5d042bfe5c Merge "Add __HIP_VDI__ to hipconfig host flags for VDI" into amd-master-next 2020-05-04 19:07:28 -04:00
German Andryeyev fd8ec70847 Avoid null stream allocation in hipFree
- Add option to skip stream allocation on access.
- Avoid null stream allocation in ihipFree, so an inactive device
won't be initialized

Change-Id: Id24426640df59a5e7a08b2dd9dcd4d67758b84bf
2020-05-04 17:17:36 -04:00
Aaron Enye Shi 43c3c89467 Add __HIP_VDI__ to hipconfig host flags for VDI
Change-Id: Ia9582f2d51b50cbe151b4866ffbfc9514825f613
2020-05-04 20:03:07 +00:00
Vlad Sytchenko bfad8d2833 Fix even more typos from 5429b40afe
Change-Id: I4f44261547b321a214348943ff5117eb5bd55b06
2020-05-04 15:26:56 -04:00
kjayapra-amd 1012459a65 SWDEV-232464 - Memory Map modules loaded via file from hipModuleLoad
Change-Id: Ibef8c28b764b8551529212d99a777ae5fe2dffda
2020-05-04 11:46:59 -04:00
Christophe Paquot 79834f3d0f Merge "SWDEV-216213 - Delete kernel function_ in hip::Function destructor" into amd-master-next 2020-05-04 11:36:52 -04:00
Aaron En Ye Shi 48b8bfc6b3 Merge "find_package(hip) changes for clang" into amd-master-next 2020-05-04 10:19:51 -04:00