Skip to content

[Bugfix][VTA] Fix FSIM compile error on macOS #14655

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tqchen merged 4 commits into from
Nov 6, 2023
Merged

[Bugfix][VTA] Fix FSIM compile error on macOS #14655

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cf27635
[Bugfix][VTA] Fix FSIM compile error on macOS.
xhmelon Apr 18, 2023
8e7cefe
Merge remote-tracking branch 'upstream/main'
xhmelon May 11, 2023
3102f12
Merge branch 'apache:main' into main
xhmelon Nov 3, 2023
2c3f1ee
Fix format.
xhmelon Nov 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions vta/runtime/runtime.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
#include "runtime.h"

#include <dmlc/logging.h>
#include <malloc.h>
#include <stdlib.h>
#include <tvm/runtime/c_runtime_api.h>
#include <vta/driver.h>
Expand Down Expand Up @@ -76,7 +75,12 @@ class AlignmentAllocator : public std::allocator<T> {

inline const_pointer address(const_reference r) const { return &r; }

inline pointer allocate(size_type n) { return (pointer)memalign(N, n * sizeof(value_type)); }
inline pointer allocate(size_type n) {
pointer mem = nullptr;
const int err = posix_memalign((void**)&mem, N, n * sizeof(value_type));
ICHECK_EQ(err, 0) << "InternalError: failed to allocate aligned memory. ";
return mem;
}

inline void deallocate(pointer p, size_type) { free(p); }

Expand Down Expand Up @@ -528,7 +532,9 @@ class UopQueue : public BaseQueue<VTAUop> {
total_size += ksize;
}

char* lbuf = (char*)memalign(ALLOC_ALIGNMENT, total_size);
char* lbuf = nullptr;
const int err = posix_memalign((void**)&lbuf, ALLOC_ALIGNMENT, total_size);
ICHECK_EQ(err, 0) << "InternalError: failed to allocate aligned memory for load buffer. ";
uint32_t offset = 0;
for (uint32_t i = 0; i < cache_.size(); ++i) {
uint32_t ksize = cache_[i]->size() * kElemBytes;
Expand Down