Revert PRs that break ROCm builds (#1781)

Fixes SWDEV-218626 and SWDEV-218629

Changes:
- Revert "`static inline` in a header, just like excess sugar in a diet, causes bloat (#1692)"
   This reverts commit b7803eb0c6.
- Revert "Fix rocFFT build failure (#1777)"
   This reverts commit 9c8c3df294.

[ROCm/hip commit: 00bd5d1cec]
This commit is contained in:
Maneesh Gupta
2020-01-08 15:11:58 +05:30
committed by GitHub
parent fcf07e0b04
commit 6ebf5ca991
11 changed files with 1418 additions and 1412 deletions
+5 -5
View File
@@ -97,13 +97,13 @@ class TidInfo {
TidInfo();
int tid() const { return _shortTid; };
pid_t pid() const { return _pid; };
pid_t pid() const { return _pid; };
uint64_t incApiSeqNum() { return ++_apiSeqNum; };
uint64_t apiSeqNum() const { return _apiSeqNum; };
private:
int _shortTid;
pid_t _pid;
pid_t _pid;
// monotonically increasing API sequence number for this threa.
uint64_t _apiSeqNum;
@@ -280,7 +280,7 @@ static const DbName dbName[] = {
#endif
inline uint64_t getTicks() { return hc::get_system_ticks(); }
static inline uint64_t getTicks() { return hc::get_system_ticks(); }
//---
extern uint64_t recordApiTrace(TlsData *tls, std::string* fullStr, const std::string& apiStr);
@@ -796,7 +796,7 @@ class ihipDevice_t {
// TODO - report this through device properties, base on HCC API call.
int _isLargeBar;
// Node id reported by kfd for this device
uint32_t _driver_node_id;
@@ -1045,7 +1045,7 @@ struct mg_info {
// setDevice first.
// - hipDeviceReset destroys the primary context for device?
// - Then context is created again for next usage.
inline ihipCtx_t* iihipGetTlsDefaultCtx(TlsData* tls) {
static inline ihipCtx_t* iihipGetTlsDefaultCtx(TlsData* tls) {
// Per-thread initialization of the TLS:
if ((tls->defaultCtx == nullptr) && (g_deviceCnt > 0)) {
tls->defaultCtx = ihipGetPrimaryCtx(0);