Commit Graph
100 Commits
Author SHA1 Message Date
sunway513 3621ec1971 resolve a segfault bug when env var not set; remove startup_kernel_loader class
[ROCm/clr commit: 7c467220a8]
2018-08-09 16:40:26 +00:00
sunway513 e1d72394da Add more check to ensure the startup loader only be enabled with the env var set to 1
[ROCm/clr commit: 7d776ae665]
2018-08-04 01:52:27 +00:00
sunway513 ef368c0f43 Add startup loader under HIP_STARTUP_LOADER env var, disable by default
[ROCm/clr commit: 9af862d364]
2018-08-04 01:48:06 +00:00
Peng 465fb7a03d Update hip_bugs.md
Remove several out-date links in hip_bugs.md document

[ROCm/clr commit: ac591da0dd]
2018-04-30 09:36:37 -05:00
Peng a880e5918d Update hip_debugging.md on typo of chicken bits
[ROCm/clr commit: 0831736e70]
2018-01-13 12:33:27 -06:00
sunway513 67afe0ec04 Change to use hipDeviceGetPCIBusId api for hipEnvVarDriver test
[ROCm/clr commit: b7c34fb80f]
2017-07-27 17:41:49 +00:00
sunway513 3015b8a12d Update Jenkinsfile to run all the built tests
[ROCm/clr commit: af8d028aa4]
2017-07-24 19:02:00 +00:00
sunway513 cf850a4bc7 Re-enable hipEnvVarDriver in Jenkinsfile
[ROCm/clr commit: ebd9708dfe]
2017-07-24 18:53:46 +00:00
sunway513 237d1318b2 Fix indentation, binary path and add wait on popen calls to hipEnvVar test
[ROCm/clr commit: 046e9c570d]
2017-07-24 17:16:13 +00:00
Sun, Peng b52c040bd5 fix typo in hipcc
Change-Id: I5f5fb3d8f1e5e8104dca45dc213c13ae9d98a583


[ROCm/clr commit: c6dee2a266]
2017-07-01 09:43:31 -05:00
Sun, Peng 8a45f03573 Remove some warning debug info and add weak attribute back to GGL __global__ define
Change-Id: I2021b107dda697b1262d44fa1506465e94a3916b


[ROCm/clr commit: 3d2a729580]
2017-06-27 14:15:16 -05:00
sunway513 9f949c5ec3 Fix docs for HIP_TRACE_API bit masks.
[ROCm/clr commit: c80d906624]
2017-06-26 17:54:30 -05:00
Sun, Peng 2582679911 Add support of HIP_HIDDEN_FREE_MEM, to deduct the returned available
memory from hipMemGetInfo API, measured in MB.

Change-Id: I7a8260c12e032e04e26611db4c38c893a29f2653


[ROCm/clr commit: e5ce585307]
2017-06-26 15:29:38 -05:00
Sun, Peng a1a23c69d3 Additional GGL make_kernel_functor_* macros, contributed by Alex
Change-Id: I01aabb7d2b5418fcefb1bbf78eb5d1888dbc5c96


[ROCm/clr commit: 9bce2af76f]
2017-06-14 11:10:52 -05:00
Sun, Peng 14e51d052e Fix error related to undefined reference of __get_dynamicgroupbaseptr().
Change-Id: I14951e1725e35dd5f5e53805f81cdb58661f59f2


[ROCm/clr commit: 682dda4418]
2017-06-08 19:24:32 -05:00
Sun, Peng 65ead764d3 Add clang version guard so the hip_fp16.h header won't be picked up by gcc
Change-Id: Ia21335a455bc93210901b44bc8c76a7f4a385b55


[ROCm/clr commit: 5450021f93]
2017-06-08 19:24:32 -05:00
Sun, Peng 450a26e5d4 Improve HIP kernel names, attributes and codegen, contributed by Alex Voicu
Change-Id: I2cafbdc5a98e26c7f4fad84739c915e7dc09993c


[ROCm/clr commit: 3b6a863eef]
2017-06-05 11:39:00 -05:00
pensun f848e9f117 fix GGL helper header file, reorder for C++17
Change-Id: I3d9ddfe670bf7e3e8e7bd85e52cc61f48c19c213


[ROCm/clr commit: 2523f8a492]
2017-05-22 08:52:43 -05:00
Sun, Peng a82ecbcc13 fix hip_complex.h header on NV path
Change-Id: Ia95d003ca1b284bab1c76723050e6b3b89178f65


[ROCm/clr commit: 50daa408aa]
2017-04-25 00:15:20 -05:00
Sun, Peng 4ac3084503 add support of hipLaunchKernelGGL on NV path
Change-Id: I0aeafd80c2181873be385d985f1d8ed86a98d136


[ROCm/clr commit: c224209200]
2017-04-19 11:00:25 -05:00
Sun, Peng 6a3bee59f1 fix broken header in NV path
Change-Id: Ia3aff2a89d9ba49547f51ce03a3304dfab58ba25


[ROCm/clr commit: ee299695a8]
2017-04-19 10:47:40 -05:00
Sun, Peng a5e8222af8 Fix ifndef guard in hip_fp16.h
Change-Id: I0215556e7aa98a74e8a984e4de3fb6e8cafdfb24


[ROCm/clr commit: 3c04722d10]
2017-04-10 11:17:05 -05:00
Sun, Peng 588dba559c add math.h to cover sqrtf function
Change-Id: Ia37752710cea4ca77e0a4e61f8e69a0355d9488d


[ROCm/clr commit: bfa61eac2c]
2017-04-10 08:53:12 -05:00
Sun, Peng 4cd6fb07d5 Update the define of __global__ for GGL
Change-Id: I563bb2a132403bcbe9e9f279b55406cf0255af7d


[ROCm/clr commit: 9884f2e83f]
2017-04-07 16:39:33 -05:00
Sun, Peng 7cedda4996 Add more operator overloading for float2 type, contributed by Aditya
Change-Id: If1ab7fb24d64bb5304142aed0951c9bd5ad47d20


[ROCm/clr commit: 19987ede22]
2017-04-07 14:17:41 -05:00
Sun, Peng 9fd6c7179d update GGL to log launched kernel information
Change-Id: Ied0aa6055673c687071b4a579aecd17f0f3f09ce


[ROCm/clr commit: f699e02715]
2017-04-07 14:06:31 -05:00
sunway513 1897ca4a20 Refactor events and add initial event option for hipHccModuleLaunchKernel
- Change hipEvent_t to a class.
- Move event logic inside the class.
- Add _type to support Independent, StartCommand, StopCommand events.
  StartCommand returns start timestamp from events.

Change-Id: I4ddd694f2645a3ff7170c9111dc1d3e39931ca21


[ROCm/clr commit: f442e975c6]
2017-04-06 21:02:50 -05:00
sunway513 c2acfe24cc Improve documentation for hipModuleLaunch functions.
Change-Id: I0e22621e499775740c3301347b7416d5f98c2414


[ROCm/clr commit: fb4e2307f1]
2017-04-06 21:02:50 -05:00
Sun, Peng 9d6a04d334 GGL update, add while 0 guard for hipLaunchKernel API
Change-Id: Ie48ef8ca2ab5e26a51febfcd92417902c33fbf66


[ROCm/clr commit: 49a38da6e3]
2017-04-06 10:48:11 -05:00
Sun, Peng 388f35c67a add extra guard to grid_launch_GGL header
Change-Id: I120619c08ea2d084804fcb1639efbe6c4648dde9


[ROCm/clr commit: 335e107f5f]
2017-04-05 22:25:41 -05:00
Sun, Peng 19c64a41a3 hip_debug.md update from Alex, regarding __device__ function restrictions
Change-Id: I5e54fd97fc632d4283f76282e3935396a1aad235


[ROCm/clr commit: bfe499a13b]
2017-04-05 16:23:27 -05:00
Sun, Peng e342bbc7fb Add more include header file for GGL, to make it self-compilable
Change-Id: I833cb194784450fb86e7961a7f9fe196ce3c7da5


[ROCm/clr commit: 2ca9eec9fc]
2017-04-03 11:16:35 -05:00
Sun, Peng b323510002 Fix hip Module APIs by disabling GGL when hipcc takes -genco option
Change-Id: I0a79e9c8e750f92c3d0be336d6ff709a2d1afd63


[ROCm/clr commit: f9c8ac5435]
2017-04-02 11:56:15 -05:00
Sun, Peng 0e23f09b47 Fix warpSize, for related issue in hipeigen and torch
Change-Id: Ic66b24923a363304dca189011869ba7a0a6f8895


[ROCm/clr commit: a7d7797781]
2017-04-01 15:42:53 -05:00
Sun, Peng 72d4fe0213 Add copy right in grid_launch.cpp
Change-Id: I7de3fc32f13182b5c41a4e44147b642ba15e8636


[ROCm/clr commit: 9762667431]
2017-04-01 15:12:00 -05:00
Sun, Peng f202567d83 Disable LLVM related config in CMakeLists.txt
Change-Id: I02e52264219d68c1ae8ea37c8df166a0edf9f7cd


[ROCm/clr commit: b91a37c78a]
2017-04-01 15:01:00 -05:00
Sun, Peng a8708e7bdd Add grid_launch.cpp for GGL
Change-Id: I87ff9b3f1203d0909f998c96c839f7b321fc3f09


[ROCm/clr commit: ae8448a9af]
2017-04-01 14:57:47 -05:00
Sun, Peng 5a4ac0929f GGL update, fix for thread-safe access to streams (accelerator_views).
Change-Id: I6dd329a85b3ba7de23d52823febee0c53857a981


[ROCm/clr commit: df4cee1a57]
2017-04-01 14:50:39 -05:00
Sun, Peng a4901cdcd3 Move current GGL limitations to hip_bugs.md
Change-Id: I77d0eae0a67eccef7dd2bea0f402736642c96554


[ROCm/clr commit: 5826e53644]
2017-04-01 08:21:06 -05:00
Sun, Peng ace18c6a57 remove extra GGL header info
Change-Id: I09f0d1b64a7a31eb2e926f19b69b7bafbacc7787


[ROCm/clr commit: e3a4547703]
2017-03-30 18:16:56 -05:00
Sun, Peng 56b2c7d82e Rename hipLaunchKernelV3 to hipLaunchKernelGGL
Change-Id: I303daae006db41e9b04eb591e0b09b2717a7cf66


[ROCm/clr commit: 9983fdb9e2]
2017-03-30 18:10:17 -05:00
Sun, Peng 06684daac1 fix hipVectorTypesDevice direct test with GGL enabled
Change-Id: I7a63b87348f08f094cd709e87397d9e0fc24e4c2


[ROCm/clr commit: 38c4331861]
2017-03-30 17:14:55 -05:00
Sun, Peng b602d68f95 update hip_faq.md on using GGL as default
Change-Id: I6ce1112eedeac3b377fe55ad8445f3c465c2eed4


[ROCm/clr commit: 67e14da511]
2017-03-30 15:03:09 -05:00
Sun, Peng 8b91454077 Enable GGL as the default kernel launch method
Change-Id: I8022d126ee28ff7e4d9a96209e399d4243d39d8b


[ROCm/clr commit: c081099de1]
2017-03-30 13:36:46 -05:00
Sun, Peng bf84371e0d Update GGL to fix one Torch build issue
Change-Id: I95a2a335902e3c368ed29f075ac72eabbb64c97e


[ROCm/clr commit: a32f50b5c7]
2017-03-29 09:03:21 -05:00
sunway513 d64768262f resolve GGL merge conflicts
Change-Id: I7a5ec3696cf2dd1a77b1686536a1cb84cbfed66e


[ROCm/clr commit: 6f38d0f55e]
2017-03-27 22:46:41 -05:00
Sun, Peng feae5cda6b update GGL implementation to use hipLaunchKernel
Change-Id: Ibc08185c814bb07d54f3e68016b10eb7b9f2bf4b


[ROCm/clr commit: 4ca09e977d]
2017-03-21 15:46:56 -05:00
Sun, Peng 962ac22fe0 Update GGL implementation to extended overload set for make_lambda_wrapper
Change-Id: I949f113671ddf155db8689e8a7f23d415839a7b5


[ROCm/clr commit: 6b9be30b70]
2017-03-21 15:46:44 -05:00
Sun, Peng db4bedeafc revert workaround for square sample and update doc on GGL
Change-Id: I731c68ca4111e7dc2e45bef51c4cad2c23fc81f8


[ROCm/clr commit: 14f8c7cf74]
2017-03-21 10:26:09 -05:00
Sun, Peng cb31fbab62 merge Alex' GGL fix for non-specialized kernel function launch
Change-Id: Idbf7ca669c38ee5c0f654bcabdd1b498abb29f69


[ROCm/clr commit: e21d4f03f1]
2017-03-20 16:34:24 -05:00
Sun, Peng 4dbdf4e7eb Add link to GGL document in hip_faq.md
Change-Id: I9f7f0200a06976d580be334c21640c816f812ebb


[ROCm/clr commit: 1fd2e281d0]
2017-03-20 15:50:10 -05:00
Sun, Peng 5c284999b2 Add document for switching to GGL in hip_faq.md
Change-Id: I83d9fd3e76d21ab572949c3a446ac3898acb3ded


[ROCm/clr commit: 3bd73d6280]
2017-03-20 15:44:28 -05:00
Sun, Peng d5f632f271 Disable additional debug warning message
Change-Id: Ic5c374589bfad387a7c4c5346430a490e2c6e2a7


[ROCm/clr commit: 2585812fba]
2017-03-17 15:03:03 -05:00
pensun a8c91ca379 Change the #define of GENERIC_GRID_LAUNCH to take valueat compilation, disable warning messages
Change-Id: Ic6c011529e26de359bcda1e7083727e7ee52887b


[ROCm/clr commit: faf0fbebe9]
2017-03-17 14:59:34 -05:00
pensun 9c9a9bb330 Initial integration with Alex' Generic Grid Launch
Change-Id: I559afb80e9e39ec0d119bb3bf3b85ef9e448caf6


[ROCm/clr commit: ad882222b0]
2017-03-17 14:59:34 -05:00
pensun a49f5c7e1d update porting guide for updated __HIP_DEVICE_COMPILE__
Change-Id: I0f025d354f76e2d728231bf112a77e8c8fcacc8c


[ROCm/clr commit: 1a2844e3a3]
2017-03-10 10:01:12 -06:00
pensun f4e9b51d35 fix typo in hip_porting_guide
Change-Id: I42553d9a4de2901dfdd57384b52a04e8fb22edde


[ROCm/clr commit: 308638c911]
2017-03-08 23:37:50 -06:00
pensun 3152223be6 add inline to all hip_complex operators
Change-Id: Ifba5966c297cbc9299c39ecfc45c7296003ebb5d


[ROCm/clr commit: 14a5d3c80d]
2017-03-08 14:06:13 -06:00
pensun 077e789db5 Define __HIPCC__ flag at compile time when using HIPCC on HCC path
Change-Id: I5e967e0e2327264d5d3b0ca705c2504fcd33d75e


[ROCm/clr commit: be95cc914f]
2017-02-28 16:20:48 -06:00
pensun e5bf4ec700 update hip_porting_guide regarding platform depended macros
Change-Id: I3029c6ae6cb280500bba294925ed6e9dc9dcc94d


[ROCm/clr commit: ae1c6ee68a]
2017-02-28 07:33:01 -06:00
pensun 72f8c29529 remove extra spaces for hip_common.h platform defines
Change-Id: Ie0e39256abba307429985371671cde01f5ea2cc9


[ROCm/clr commit: c5ae8c423a]
2017-02-27 12:55:22 -06:00
pensun b411549397 Add pseudo code example for hip_bugs.md
Change-Id: Ia2af8e6165faeb3fbb81428e20d4dc5b19b2fa9e


[ROCm/clr commit: f2bfc8a405]
2017-02-08 16:20:01 -06:00
pensun 41bb48dd49 more fix on hipmallocarray on NV path
Change-Id: I890a36cab10c101f4a112bc4567f765b318d486c


[ROCm/clr commit: f18efd5d15]
2017-01-26 12:30:52 -06:00
pensun 0ecc88bebd fix missing semicolon on NV path
Change-Id: I3cfecb7bd534578a1f5a07ca9397092dcf01db07


[ROCm/clr commit: 42f22162e0]
2017-01-26 11:28:15 -06:00
pensun 8bcdd56fa0 Add more hip_bug.md entry, regarding hang after hipLaunchKernel
Change-Id: I5800cb627179ec0e913cd36d332fb8c2994ab71e


[ROCm/clr commit: a8fcbb2584]
2017-01-24 22:43:25 -06:00
pensun 5d356d12de Initial commit on hip_bugs markdown doc
Change-Id: I5a6915337b8664cfed9eaee9443c6e4406348574


[ROCm/clr commit: 24d9827688]
2017-01-24 22:30:36 -06:00
pensun 0d8957fb9a HIP IPC implementation on ROCr IPC APIs
Change-Id: I1ca9d520f5d0b1b56694211471b81eb7c6c23d16


[ROCm/clr commit: 7ac5f2e8c3]
2016-12-07 15:38:36 -06:00
pensun 87f69ab605 Fix issue of ihipModule_t double defined
Change-Id: I508677e595776fd573a2f224691116d01288dc78


[ROCm/clr commit: 8f2a1752c1]
2016-12-06 19:10:17 -06:00
pensun e885147485 change hipgetPCIID to take int as third parameter
Change-Id: I4429b36756a6d868a769abd783bf28a55147c0d0


[ROCm/clr commit: 8fcae3acc0]
2016-12-06 14:24:09 -06:00
pensun 707358d0b4 IPC prototyps and part of the implementation included
Change-Id: Id88c7f155d23ec63f57a6ef05098fba43f8af336


[ROCm/clr commit: 092924d660]
2016-12-06 14:24:09 -06:00
pensun aaecc3fe04 local changes for hipnccl
Change-Id: I05a1f0381ce2914a800f573342cc954eb5ff82d9


[ROCm/clr commit: 808e555247]
2016-12-06 14:22:02 -06:00
pensun 70f0a2f43b HIP resource leaks fix from Jack
Change-Id: I93f3ad7cb94ff1cba1577bd8acc90e826693d12e


[ROCm/clr commit: 4cb1579d4a]
2016-12-05 20:21:33 -06:00
pensun 946e9b4163 Change to use produce device name by default
Change-Id: Ie2cee2a2e94a08b5874a2f5abee5d1ab6c9fdf47


[ROCm/clr commit: 504fcaf786]
2016-11-29 11:34:06 -06:00
pensun b4b8de3cd7 Change the parameter type of hipDeviceGetPCIBusID to char*
Change-Id: Ia72f403126e95f65da53208fc246f45d1417381f


[ROCm/clr commit: 8e2980c7ef]
2016-11-28 10:47:18 -06:00
pensun 29a69adda7 Add some missing APIs on nv path and hipify
Change-Id: Ic0f4740ab06bf70b1de61b39fedc7a6e7605cb61


[ROCm/clr commit: 69b43ec17c]
2016-11-23 14:36:30 -06:00
pensun bf34811dbe Add several missing APIs in hipify
Change-Id: I58912871cb0b10128f221ef26a11b0d69fb7873c


[ROCm/clr commit: a4b43a6610]
2016-11-23 14:06:18 -06:00
pensun dd1061b874 Add direct test case for threadfence_system workaround
Change-Id: I5b21b590e957c901044741ac94e816cd8b1426f9


[ROCm/clr commit: 992f94b3a1]
2016-11-11 15:09:43 -06:00
pensun 8ea566f2b2 Update depreciated information for threadfence_system()
Change-Id: Id13d2f81edb51eb42b896a5c06913d59ec907c55


[ROCm/clr commit: 9aa2269d5c]
2016-11-10 11:55:12 -06:00
pensun daf19a2dbb resolve conflicts for git pull
Change-Id: Ie353b831e2241bc28042069b6cc7405257e871e1


[ROCm/clr commit: bbb619c732]
2016-11-09 21:38:43 -06:00
pensun ce1b4bdc06 Add documentation on threadfence_system workaround guidelines.
Change-Id: I9636a3808798f3dabe992285ce5652187cee6eb8


[ROCm/clr commit: 94dfff9db2]
2016-11-09 21:36:30 -06:00
pensun 61635b585f Add option to alloc fingrained system memory
Change-Id: Ia13c8e058cb988b5857e75a590a4d67411362ae1


[ROCm/clr commit: 23de0e1b50]
2016-11-09 21:36:30 -06:00
pensun 85fa855e18 fix hipProfiler* apis on NV path
Change-Id: I6adca6151fef3a9b35348163eb6bd13f5c414172


[ROCm/clr commit: 4a8a6a4697]
2016-11-09 15:44:01 -06:00
pensun 12a5923a2b fix for hipcallback function on NV path
Change-Id: If80c0cfe60b1f3b1a71627b5f3f79503cba4d491


[ROCm/clr commit: e5277ab4b6]
2016-11-09 11:33:23 -06:00
pensun 8911a02b17 Update document for workaround suggestion on threadfence_system()
Change-Id: Icccab8270604a0e578a8614b9afb3f95372f4966


[ROCm/clr commit: 212fa7033c]
2016-11-02 16:08:27 -05:00
pensun 00ce529177 Update hipStreamNonBlocking to use cuda define on NV path
Change-Id: I74ea09db99d602ba1c5f192b36ff7f2781176e6a


[ROCm/clr commit: 9f86e47800]
2016-11-01 20:30:56 -05:00
pensun 33b6db2322 Add missing hipStream typedef for NV path
Change-Id: I915cd14a9ff32b55b0121062d7804a7fbbdc3341


[ROCm/clr commit: dcdb7f6c68]
2016-10-27 13:34:14 -05:00
pensun 6818eaf657 Remove extra semicolons and extra spaces in header on NV path
Change-Id: Ib33aec2451a4e0b298d537dbb1b9df000405871b


[ROCm/clr commit: 0dbc6a1e93]
2016-10-26 10:23:10 +05:30
pensun 6f4ae9b9c4 Remove extra semicolons and extra spaces in header on NV path
Change-Id: Ib33aec2451a4e0b298d537dbb1b9df000405871b


[ROCm/clr commit: ee126928b1]
2016-10-25 15:29:52 -05:00
pensun b98e815865 Modify hipStreamAddCallback test case to consider both NULL stream and stream
Change-Id: I8468c988f0f01c7d3f3176a01469d69bf7a68237


[ROCm/clr commit: 4a93beb3b0]
2016-10-23 12:36:02 -05:00
pensun 57fab304c7 Add direct test for hipStreamAddCallback workaround
Change-Id: I890574eb30a76922888846882986edd0dc345309


[ROCm/clr commit: ad09270d7b]
2016-10-23 12:18:09 -05:00
pensun b0a039cd5e Add workaround for hipStreamAddCallback function: call stream synchronize on host and then add execute the call back function
Change-Id: If361f8e053949904b19b9e09245d267f05e29f7b


[ROCm/clr commit: 7a0375854a]
2016-10-22 23:59:39 -05:00
pensun eecfd8e141 Add ifdef guard for the feature requires ROCm1.3
Change-Id: I7154517c47000c37fe5eb09a3c1cf2a9aacbe27c


[ROCm/clr commit: 0ac70e7184]
2016-10-13 10:57:31 -05:00
pensun f638d13f7c Change to query device name using HSA_AMD_AGENT_INFO_PRODUCT_NAME;
Note: this commit depends on ROCR runtime in ROCm 1.3 release.

Change-Id: I90385ef6d11ee8a1e8adae1d3fdf21747347544c


[ROCm/clr commit: 44cc44011b]
2016-10-12 20:01:30 -05:00
pensun ff4b8932c9 update hipcc to search for lib using CUDA_PATH on NV path
Change-Id: I7e19d1f82237a8a13f3d8284b313ac049be3f920


[ROCm/clr commit: fea7dc684a]
2016-09-29 15:11:57 -05:00
pensun 3b2e733b19 add hipEvent* macros on NV path
Change-Id: I28ff0fa24f69560e13366e7cd8d3a485665c67e1


[ROCm/clr commit: 4570877142]
2016-09-29 01:22:19 -05:00
pensun eb5bb292ae change hipEnvVarDriver to reduce communications to hipEnvVar
Change-Id: I65a5f67dd51d53594fa51f88505e32321643d189


[ROCm/clr commit: e6d7ecc0f5]
2016-09-27 23:00:11 -05:00
pensun 62ecc57afd fix of HIPCC on libc++ option on HCC path
Change-Id: Ie0d3213a165fa13f033b777b490eb60b980d02da


[ROCm/clr commit: 5bdb9e349c]
2016-09-26 14:39:57 -05:00
pensun 536fbebbe6 doc fix for hipStream
Change-Id: I618464c8b9ffa0a566434e72d2bc87a152884ca1


[ROCm/clr commit: d64bbacdd9]
2016-09-21 12:03:01 -05:00
pensun bc4632f143 Revert "resolve merge conflict"
This reverts commit 6c680d648b.


[ROCm/clr commit: e11b6144e4]
2016-09-16 16:04:48 -05:00
pensun 6c680d648b resolve merge conflict
Change-Id: I041730d4208ae1865820f5df73a67ba60fd4bc3c


[ROCm/clr commit: 213fd6c961]
2016-09-16 11:13:43 -05:00