Skip to content
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

Jump to bottom

Remove compile time check of DISABLE_ISSUE_FIX_3487 in favor of runtime check of arch #113

Merged
merged 1 commit into from
Oct 3, 2024
Merged

Remove compile time check of DISABLE_ISSUE_FIX_3487 in favor of runtime check of arch #113

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 14 additions & 15 deletions device/pcie/pci_device.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
*/

#include <cstdint>
#include <cstring> // for memcpy
#include <vector>
#include <fcntl.h> // for ::open
#include <unistd.h> // for ::close
Expand Down Expand Up @@ -35,8 +36,7 @@ tt::ARCH detect_arch(int device_id){
// which glibc's memcpy may perform when unrolling. This affects from and to device.
// 2. syseng#3487 WH GDDR5 controller has a bug when 1-byte writes are temporarily adjacent
// to 2-byte writes. We avoid ever performing a 1-byte write to the device. This only affects to device.
#ifndef DISABLE_ISSUE_3487_FIX
void memcpy_to_device(void *dest, const void *src, std::size_t num_bytes) {
inline void memcpy_to_device(void *dest, const void *src, std::size_t num_bytes) {
typedef std::uint32_t copy_t;

// Start by aligning the destination (device) pointer. If needed, do RMW to fix up the
Expand Down Expand Up @@ -82,7 +82,7 @@ void memcpy_to_device(void *dest, const void *src, std::size_t num_bytes) {
}
}

void memcpy_from_device(void *dest, const void *src, std::size_t num_bytes) {
inline void memcpy_from_device(void *dest, const void *src, std::size_t num_bytes) {
typedef std::uint32_t copy_t;

// Start by aligning the source (device) pointer.
Expand Down Expand Up @@ -119,7 +119,6 @@ void memcpy_from_device(void *dest, const void *src, std::size_t num_bytes) {
std::memcpy(dp, &tmp, trailing_len);
}
}
#endif

// --------------------------------------------------------------------------------------------------------------
// --------------------------------------------------------------------------------------------------------------
Expand Down Expand Up @@ -364,16 +363,16 @@ void PCIDevice::write_block(uint64_t byte_addr, uint64_t num_bytes, const uint8_
if (bar4_wc != nullptr && byte_addr >= BAR0_BH_SIZE) {
byte_addr -= BAR0_BH_SIZE;
dest = reinterpret_cast<uint8_t *>(bar4_wc) + byte_addr;
}else {
} else {
dest = get_register_address<uint8_t>(byte_addr);
}

const void *src = reinterpret_cast<const void *>(buffer_addr);
#ifdef DISABLE_ISSUE_3487_FIX
memcpy(dest, src, num_bytes);
#else
memcpy_to_device(dest, src, num_bytes);
#endif
if (arch == tt::ARCH::WORMHOLE_B0) {
memcpy_to_device(dest, src, num_bytes);
} else {
memcpy(dest, src, num_bytes);
}
}

void PCIDevice::read_block(uint64_t byte_addr, uint64_t num_bytes, uint8_t* buffer_addr) {
Expand All @@ -386,11 +385,11 @@ void PCIDevice::read_block(uint64_t byte_addr, uint64_t num_bytes, uint8_t* buff
}

void *dest = reinterpret_cast<void *>(buffer_addr);
#ifdef DISABLE_ISSUE_3487_FIX
memcpy(dest, src, num_bytes);
#else
memcpy_from_device(dest, src, num_bytes);
#endif
if (arch == tt::ARCH::WORMHOLE_B0) {
memcpy_from_device(dest, src, num_bytes);
} else {
memcpy(dest, src, num_bytes);
}
}

// This is only needed for the BH workaround in iatu_configure_peer_region since no arc
Expand Down
Loading