You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tvm.apache.org by GitBox <gi...@apache.org> on 2022/06/09 20:33:30 UTC
[GitHub] [tvm] adstraw opened a new pull request, #11653: [Hexagon] Add HexagonThreadManager
adstraw opened a new pull request, #11653:
URL: https://github.com/apache/tvm/pull/11653
This PR was made in collaboration with @[JosephTheOctonaut](https://github.com/JosephTheOctonaut).
Add HexagonThreadManager class and unit testing. HexagonThreadManager can be used to spawn a given number of QURT threads on which the user can `Dispatch` work including basic `Signal` and `Wait` functionality to create synchronization points between threads. This PR adds the low-level HexagonThreadManager class only. Related Hexagon Device API support and codegen to come in future PRs.
This PR is dependent on #11635 to pass CI.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@tvm.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [tvm] kparzysz-quic commented on a diff in pull request #11653: [Hexagon] Add HexagonThreadManager
Posted by GitBox <gi...@apache.org>.
kparzysz-quic commented on code in PR #11653:
URL: https://github.com/apache/tvm/pull/11653#discussion_r894693764
##########
src/runtime/hexagon/hexagon_thread_manager.h:
##########
@@ -0,0 +1,196 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+#ifndef TVM_RUNTIME_HEXAGON_HEXAGON_THREAD_MANAGER_H_
+#define TVM_RUNTIME_HEXAGON_HEXAGON_THREAD_MANAGER_H_
+
+#include <tvm/runtime/c_runtime_api.h>
+#include <tvm/runtime/logging.h>
+#include <tvm/runtime/packed_func.h>
+
+#include <memory>
+#include <unordered_map>
+#include <utility>
+#include <vector>
+
+#include "hexagon_buffer.h"
+#include "hexagon_buffer_manager.h"
+#include "hexagon_common.h"
+#include "qurt.h"
+
+namespace tvm {
+namespace runtime {
+namespace hexagon {
+
+#define DBG(msg) DLOG(INFO) << msg << "\n";
+
+class HexagonThreadManager {
+ //! \brief Void function.
+ typedef void (*voidfunc)(void*);
+ //! \brief Semaphore ID.
+ typedef unsigned SyncPoint;
Review Comment:
Please prefer `using` to `typedef`.
##########
src/runtime/hexagon/hexagon_thread_manager.h:
##########
@@ -0,0 +1,196 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+#ifndef TVM_RUNTIME_HEXAGON_HEXAGON_THREAD_MANAGER_H_
+#define TVM_RUNTIME_HEXAGON_HEXAGON_THREAD_MANAGER_H_
+
+#include <tvm/runtime/c_runtime_api.h>
+#include <tvm/runtime/logging.h>
+#include <tvm/runtime/packed_func.h>
+
+#include <memory>
+#include <unordered_map>
+#include <utility>
+#include <vector>
+
+#include "hexagon_buffer.h"
+#include "hexagon_buffer_manager.h"
+#include "hexagon_common.h"
+#include "qurt.h"
+
+namespace tvm {
+namespace runtime {
+namespace hexagon {
+
+#define DBG(msg) DLOG(INFO) << msg << "\n";
Review Comment:
Could you just use `DLOG(INFO)` directly in the code? This macro doesn't save a lot.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@tvm.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [tvm] kparzysz-quic commented on pull request #11653: [Hexagon] Add HexagonThreadManager
Posted by GitBox <gi...@apache.org>.
kparzysz-quic commented on PR #11653:
URL: https://github.com/apache/tvm/pull/11653#issuecomment-1151630188
On another note---all the thread manager files spell "threadmanager" without the underscore, while "buffer manager" has one. Could you add the underscore for consistency?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@tvm.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [tvm] adstraw commented on a diff in pull request #11653: [Hexagon] Add HexagonThreadManager
Posted by GitBox <gi...@apache.org>.
adstraw commented on code in PR #11653:
URL: https://github.com/apache/tvm/pull/11653#discussion_r894040034
##########
src/runtime/hexagon/hexagon_buffer_manager.h:
##########
@@ -0,0 +1,82 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+#ifndef TVM_RUNTIME_HEXAGON_HEXAGON_BUFFER_MANAGER_H_
+#define TVM_RUNTIME_HEXAGON_HEXAGON_BUFFER_MANAGER_H_
+
+#include <tvm/runtime/logging.h>
+
+#include <memory>
+#include <unordered_map>
+#include <utility>
+
+#include "hexagon_buffer.h"
+
+namespace tvm {
+namespace runtime {
+namespace hexagon {
+
+class HexagonBufferManager {
+ public:
+ /*!
+ * \brief Free a HexagonBuffer.
+ * \param ptr Address of the HexagonBuffer as returned by `AllocateHexagonBuffer`.
+ */
+ void FreeHexagonBuffer(void* ptr) {
+ auto it = hexagon_buffer_map_.find(ptr);
+ CHECK(it != hexagon_buffer_map_.end())
+ << "Attempt made to free unknown or already freed dataspace allocation";
+ CHECK(it->second != nullptr);
+ hexagon_buffer_map_.erase(it);
+ }
+ /*!
+ * \brief Allocate a HexagonBuffer.
+ * \param args Templated arguments to pass through to HexagonBuffer constructor.
+ */
+ template <typename... Args>
+ void* AllocateHexagonBuffer(Args&&... args) {
+ auto buf = std::make_unique<HexagonBuffer>(std::forward<Args>(args)...);
+ void* ptr = buf->GetPointer();
+ hexagon_buffer_map_.insert({ptr, std::move(buf)});
+ return ptr;
+ }
+
+ //! \brief Returns whether the HexagonBuffer is in the map.
+ size_t count(void* ptr) { return hexagon_buffer_map_.count(ptr); }
+
+ //! \brief Returns an iterator to the HexagonBuffer within the map.
+ std::unordered_map<void*, std::unique_ptr<HexagonBuffer>>::iterator find(void* ptr) {
+ return hexagon_buffer_map_.find(ptr);
+ }
+
+ //! \brief Retruns the end of the map.
+ std::unordered_map<void*, std::unique_ptr<HexagonBuffer>>::iterator end() {
+ return hexagon_buffer_map_.end();
+ }
Review Comment:
Done.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@tvm.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [tvm] kparzysz-quic merged pull request #11653: [Hexagon] Add HexagonThreadManager
Posted by GitBox <gi...@apache.org>.
kparzysz-quic merged PR #11653:
URL: https://github.com/apache/tvm/pull/11653
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@tvm.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [tvm] kparzysz-quic commented on pull request #11653: [Hexagon] Add HexagonThreadManager
Posted by GitBox <gi...@apache.org>.
kparzysz-quic commented on PR #11653:
URL: https://github.com/apache/tvm/pull/11653#issuecomment-1152722217
Thanks Adam!
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@tvm.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [tvm] adstraw commented on pull request #11653: [Hexagon] Add HexagonThreadManager
Posted by GitBox <gi...@apache.org>.
adstraw commented on PR #11653:
URL: https://github.com/apache/tvm/pull/11653#issuecomment-1152762287
Just a reminder that CI is failing because it requires this PR https://github.com/apache/tvm/pull/11635
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@tvm.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [tvm] adstraw commented on pull request #11653: [Hexagon] Add HexagonThreadManager
Posted by GitBox <gi...@apache.org>.
adstraw commented on PR #11653:
URL: https://github.com/apache/tvm/pull/11653#issuecomment-1151717231
> Could you move the buffer manager changes to a separate PR? They seem independent from the thread manager.
I am basically moving this functionality from within the Hexagon Device API where it lived previously to a separate header file. Both the Hexagon Device API and the Hexagon Thread Manager need a Hexagon Buffer Manager. The alternative would be two duplicate code in two places.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@tvm.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [tvm] adstraw commented on pull request #11653: [Hexagon] Add HexagonThreadManager
Posted by GitBox <gi...@apache.org>.
adstraw commented on PR #11653:
URL: https://github.com/apache/tvm/pull/11653#issuecomment-1152723692
> The (TVMStreamHandle)i is still there. It's not that much of a big deal, but it would be nice to replace it with static_cast eventually.
Missed this. Will fix.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@tvm.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [tvm] adstraw commented on pull request #11653: [Hexagon] Add HexagonThreadManager
Posted by GitBox <gi...@apache.org>.
adstraw commented on PR #11653:
URL: https://github.com/apache/tvm/pull/11653#issuecomment-1152758033
Just realized that I named my commit "static cast for TVMStreamHandle` before I realized that reinterpret_cast was required. I can rename that commit or ...
Just thinking out loud here ... the other thing we can do RE `TVMStreamHandle` is just remove it from this PR. It's there because we are looking ahead to working with actual stream handles at the Device API level. But, what we really need is just an `unsigned` thread ID. What's there is a bit of a misuse of a pointer type to stash an integer and probably over-engineered at least for the time being.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@tvm.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [tvm] kparzysz-quic commented on pull request #11653: [Hexagon] Add HexagonThreadManager
Posted by GitBox <gi...@apache.org>.
kparzysz-quic commented on PR #11653:
URL: https://github.com/apache/tvm/pull/11653#issuecomment-1152761180
I wouldn't worry about renaming a commit in the PR. The code looks fine. For some reason I thought that the stream handle was actually an integer...
When the CI passes, I can change the entry in the commit message to read "reinterpret" instead of "static" right before committing.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@tvm.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [tvm] kparzysz-quic commented on a diff in pull request #11653: [Hexagon] Add HexagonThreadManager
Posted by GitBox <gi...@apache.org>.
kparzysz-quic commented on code in PR #11653:
URL: https://github.com/apache/tvm/pull/11653#discussion_r893957164
##########
src/runtime/hexagon/hexagon_buffer_manager.h:
##########
@@ -0,0 +1,82 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+#ifndef TVM_RUNTIME_HEXAGON_HEXAGON_BUFFER_MANAGER_H_
+#define TVM_RUNTIME_HEXAGON_HEXAGON_BUFFER_MANAGER_H_
+
+#include <tvm/runtime/logging.h>
+
+#include <memory>
+#include <unordered_map>
+#include <utility>
+
+#include "hexagon_buffer.h"
+
+namespace tvm {
+namespace runtime {
+namespace hexagon {
+
+class HexagonBufferManager {
+ public:
+ /*!
+ * \brief Free a HexagonBuffer.
+ * \param ptr Address of the HexagonBuffer as returned by `AllocateHexagonBuffer`.
+ */
+ void FreeHexagonBuffer(void* ptr) {
+ auto it = hexagon_buffer_map_.find(ptr);
+ CHECK(it != hexagon_buffer_map_.end())
+ << "Attempt made to free unknown or already freed dataspace allocation";
+ CHECK(it->second != nullptr);
+ hexagon_buffer_map_.erase(it);
+ }
+ /*!
+ * \brief Allocate a HexagonBuffer.
+ * \param args Templated arguments to pass through to HexagonBuffer constructor.
+ */
+ template <typename... Args>
+ void* AllocateHexagonBuffer(Args&&... args) {
+ auto buf = std::make_unique<HexagonBuffer>(std::forward<Args>(args)...);
+ void* ptr = buf->GetPointer();
+ hexagon_buffer_map_.insert({ptr, std::move(buf)});
+ return ptr;
+ }
+
+ //! \brief Returns whether the HexagonBuffer is in the map.
+ size_t count(void* ptr) { return hexagon_buffer_map_.count(ptr); }
+
+ //! \brief Returns an iterator to the HexagonBuffer within the map.
+ std::unordered_map<void*, std::unique_ptr<HexagonBuffer>>::iterator find(void* ptr) {
+ return hexagon_buffer_map_.find(ptr);
+ }
+
+ //! \brief Retruns the end of the map.
+ std::unordered_map<void*, std::unique_ptr<HexagonBuffer>>::iterator end() {
+ return hexagon_buffer_map_.end();
+ }
Review Comment:
This is unnecessary.
##########
src/runtime/hexagon/hexagon_buffer_manager.h:
##########
@@ -0,0 +1,82 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+#ifndef TVM_RUNTIME_HEXAGON_HEXAGON_BUFFER_MANAGER_H_
+#define TVM_RUNTIME_HEXAGON_HEXAGON_BUFFER_MANAGER_H_
+
+#include <tvm/runtime/logging.h>
+
+#include <memory>
+#include <unordered_map>
+#include <utility>
+
+#include "hexagon_buffer.h"
+
+namespace tvm {
+namespace runtime {
+namespace hexagon {
+
+class HexagonBufferManager {
+ public:
+ /*!
+ * \brief Free a HexagonBuffer.
+ * \param ptr Address of the HexagonBuffer as returned by `AllocateHexagonBuffer`.
+ */
+ void FreeHexagonBuffer(void* ptr) {
+ auto it = hexagon_buffer_map_.find(ptr);
+ CHECK(it != hexagon_buffer_map_.end())
+ << "Attempt made to free unknown or already freed dataspace allocation";
+ CHECK(it->second != nullptr);
+ hexagon_buffer_map_.erase(it);
+ }
+ /*!
+ * \brief Allocate a HexagonBuffer.
+ * \param args Templated arguments to pass through to HexagonBuffer constructor.
+ */
+ template <typename... Args>
+ void* AllocateHexagonBuffer(Args&&... args) {
+ auto buf = std::make_unique<HexagonBuffer>(std::forward<Args>(args)...);
+ void* ptr = buf->GetPointer();
+ hexagon_buffer_map_.insert({ptr, std::move(buf)});
+ return ptr;
+ }
+
+ //! \brief Returns whether the HexagonBuffer is in the map.
+ size_t count(void* ptr) { return hexagon_buffer_map_.count(ptr); }
+
+ //! \brief Returns an iterator to the HexagonBuffer within the map.
+ std::unordered_map<void*, std::unique_ptr<HexagonBuffer>>::iterator find(void* ptr) {
+ return hexagon_buffer_map_.find(ptr);
+ }
Review Comment:
Return the pointer to the `HexagonBuffer`, or `nullptr` if not found.
##########
src/runtime/hexagon/hexagon_device_api.cc:
##########
@@ -144,8 +143,8 @@ void HexagonDeviceAPI::CopyDataFromTo(DLTensor* from, DLTensor* to, TVMStreamHan
CHECK_EQ(GetDataSize(*from), GetDataSize(*to));
auto lookup_hexagon_buffer = [this](void* ptr) -> HexagonBuffer* {
- auto it = this->hexagon_buffer_map_.find(ptr);
- if (it != this->hexagon_buffer_map_.end()) {
+ auto it = hexbuffs.find(ptr);
+ if (it != hexbuffs.end()) {
return it->second.get();
}
return nullptr;
Review Comment:
`return hexbuffs.find(ptr);`
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@tvm.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [tvm] adstraw commented on a diff in pull request #11653: [Hexagon] Add HexagonThreadManager
Posted by GitBox <gi...@apache.org>.
adstraw commented on code in PR #11653:
URL: https://github.com/apache/tvm/pull/11653#discussion_r894863446
##########
src/runtime/hexagon/hexagon_thread_manager.h:
##########
@@ -0,0 +1,196 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+#ifndef TVM_RUNTIME_HEXAGON_HEXAGON_THREAD_MANAGER_H_
+#define TVM_RUNTIME_HEXAGON_HEXAGON_THREAD_MANAGER_H_
+
+#include <tvm/runtime/c_runtime_api.h>
+#include <tvm/runtime/logging.h>
+#include <tvm/runtime/packed_func.h>
+
+#include <memory>
+#include <unordered_map>
+#include <utility>
+#include <vector>
+
+#include "hexagon_buffer.h"
+#include "hexagon_buffer_manager.h"
+#include "hexagon_common.h"
+#include "qurt.h"
+
+namespace tvm {
+namespace runtime {
+namespace hexagon {
+
+#define DBG(msg) DLOG(INFO) << msg << "\n";
+
+class HexagonThreadManager {
+ //! \brief Void function.
+ typedef void (*voidfunc)(void*);
+ //! \brief Semaphore ID.
+ typedef unsigned SyncPoint;
Review Comment:
Done.
##########
src/runtime/hexagon/hexagon_thread_manager.h:
##########
@@ -0,0 +1,196 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+#ifndef TVM_RUNTIME_HEXAGON_HEXAGON_THREAD_MANAGER_H_
+#define TVM_RUNTIME_HEXAGON_HEXAGON_THREAD_MANAGER_H_
+
+#include <tvm/runtime/c_runtime_api.h>
+#include <tvm/runtime/logging.h>
+#include <tvm/runtime/packed_func.h>
+
+#include <memory>
+#include <unordered_map>
+#include <utility>
+#include <vector>
+
+#include "hexagon_buffer.h"
+#include "hexagon_buffer_manager.h"
+#include "hexagon_common.h"
+#include "qurt.h"
+
+namespace tvm {
+namespace runtime {
+namespace hexagon {
+
+#define DBG(msg) DLOG(INFO) << msg << "\n";
Review Comment:
Done.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@tvm.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [tvm] adstraw commented on a diff in pull request #11653: [Hexagon] Add HexagonThreadManager
Posted by GitBox <gi...@apache.org>.
adstraw commented on code in PR #11653:
URL: https://github.com/apache/tvm/pull/11653#discussion_r894039921
##########
src/runtime/hexagon/hexagon_device_api.cc:
##########
@@ -144,8 +143,8 @@ void HexagonDeviceAPI::CopyDataFromTo(DLTensor* from, DLTensor* to, TVMStreamHan
CHECK_EQ(GetDataSize(*from), GetDataSize(*to));
auto lookup_hexagon_buffer = [this](void* ptr) -> HexagonBuffer* {
- auto it = this->hexagon_buffer_map_.find(ptr);
- if (it != this->hexagon_buffer_map_.end()) {
+ auto it = hexbuffs.find(ptr);
+ if (it != hexbuffs.end()) {
return it->second.get();
}
return nullptr;
Review Comment:
Done.
##########
src/runtime/hexagon/hexagon_buffer_manager.h:
##########
@@ -0,0 +1,82 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+#ifndef TVM_RUNTIME_HEXAGON_HEXAGON_BUFFER_MANAGER_H_
+#define TVM_RUNTIME_HEXAGON_HEXAGON_BUFFER_MANAGER_H_
+
+#include <tvm/runtime/logging.h>
+
+#include <memory>
+#include <unordered_map>
+#include <utility>
+
+#include "hexagon_buffer.h"
+
+namespace tvm {
+namespace runtime {
+namespace hexagon {
+
+class HexagonBufferManager {
+ public:
+ /*!
+ * \brief Free a HexagonBuffer.
+ * \param ptr Address of the HexagonBuffer as returned by `AllocateHexagonBuffer`.
+ */
+ void FreeHexagonBuffer(void* ptr) {
+ auto it = hexagon_buffer_map_.find(ptr);
+ CHECK(it != hexagon_buffer_map_.end())
+ << "Attempt made to free unknown or already freed dataspace allocation";
+ CHECK(it->second != nullptr);
+ hexagon_buffer_map_.erase(it);
+ }
+ /*!
+ * \brief Allocate a HexagonBuffer.
+ * \param args Templated arguments to pass through to HexagonBuffer constructor.
+ */
+ template <typename... Args>
+ void* AllocateHexagonBuffer(Args&&... args) {
+ auto buf = std::make_unique<HexagonBuffer>(std::forward<Args>(args)...);
+ void* ptr = buf->GetPointer();
+ hexagon_buffer_map_.insert({ptr, std::move(buf)});
+ return ptr;
+ }
+
+ //! \brief Returns whether the HexagonBuffer is in the map.
+ size_t count(void* ptr) { return hexagon_buffer_map_.count(ptr); }
+
+ //! \brief Returns an iterator to the HexagonBuffer within the map.
+ std::unordered_map<void*, std::unique_ptr<HexagonBuffer>>::iterator find(void* ptr) {
+ return hexagon_buffer_map_.find(ptr);
+ }
Review Comment:
Done.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@tvm.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org