derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

arch-riscv: Define vlwhole/vswhole mem acceses using vlen.

Browse Source 
This patch fixes the size of the memory acceses in vswhole and
vlwhole instructions to the maximum vector length.

Change-Id: Ib86b5356d9f1dfa277cb4b367893e3b08242f93e
This commit is contained in:
Alvaro Moreno
2023-10-12 20:02:41 +02:00
committed by Adrià Armejach
parent bfb295ac3f
commit edf1d69257
2 changed files with 87 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
src/arch/generic/memhelpers.hh
View File

@@ -124,6 +124,24 @@ readMemAtomic(XC *xc, trace::InstRecord *traceData, Addr addr, MemT &mem,
return fault;
}
/// Read from memory in atomic mode.
template <ByteOrder Order, class XC, class MemT>
Fault
readMemAtomic(XC *xc, trace::InstRecord *traceData, Addr addr, MemT &mem,
size_t size, Request::Flags flags)
{
memset(&mem, 0, size);
static const std::vector<bool> byte_enable(size, true);
Fault fault = readMemAtomic(xc, addr, (uint8_t*)&mem,
size, flags, byte_enable);
if (fault == NoFault) {
mem = gtoh(mem, Order);
if (traceData)
traceData->setData(mem);
}
return fault;
}
template <class XC, class MemT>
Fault
readMemAtomicLE(XC *xc, trace::InstRecord *traceData, Addr addr, MemT &mem,
@@ -133,6 +151,16 @@ readMemAtomicLE(XC *xc, trace::InstRecord *traceData, Addr addr, MemT &mem,
xc, traceData, addr, mem, flags);
}
template <class XC, class MemT>
Fault
readMemAtomicLE(XC *xc, trace::InstRecord *traceData, Addr addr, MemT &mem,
size_t size, Request::Flags flags)
{
return readMemAtomic<ByteOrder::little>(
xc, traceData, addr, mem, size, flags);
}
template <class XC, class MemT>
Fault
readMemAtomicBE(XC *xc, trace::InstRecord *traceData, Addr addr, MemT &mem,
@@ -165,6 +193,20 @@ writeMemTiming(XC *xc, trace::InstRecord *traceData, MemT mem, Addr addr,
sizeof(MemT), flags, res, byte_enable);
}
template <ByteOrder Order, class XC, class MemT>
Fault
writeMemTiming(XC *xc, trace::InstRecord *traceData, MemT mem, Addr addr,
size_t size, Request::Flags flags, uint64_t *res)
{
if (traceData) {
traceData->setData(mem);
}
mem = htog(mem, Order);
static const std::vector<bool> byte_enable(size, true);
return writeMemTiming(xc, (uint8_t*)&mem, addr,
size, flags, res, byte_enable);
}
template <class XC, class MemT>
Fault
writeMemTimingLE(XC *xc, trace::InstRecord *traceData, MemT mem, Addr addr,
@@ -174,6 +216,15 @@ writeMemTimingLE(XC *xc, trace::InstRecord *traceData, MemT mem, Addr addr,
xc, traceData, mem, addr, flags, res);
}
template <class XC, class MemT>
Fault
writeMemTimingLE(XC *xc, trace::InstRecord *traceData, MemT mem, Addr addr,
size_t size, Request::Flags flags, uint64_t *res)
{
return writeMemTiming<ByteOrder::little>(
xc, traceData, mem, addr, size, flags, res);
}
template <class XC, class MemT>
Fault
writeMemTimingBE(XC *xc, trace::InstRecord *traceData, MemT mem, Addr addr,
@@ -214,6 +265,27 @@ writeMemAtomic(XC *xc, trace::InstRecord *traceData, const MemT &mem,
return fault;
}
template <ByteOrder Order, class XC, class MemT>
Fault
writeMemAtomic(XC *xc, trace::InstRecord *traceData, const MemT &mem,
Addr addr, size_t size, Request::Flags flags, uint64_t *res)
{
if (traceData) {
traceData->setData(mem);
}
MemT host_mem = htog(mem, Order);
static const std::vector<bool> byte_enable(size, true);
Fault fault = writeMemAtomic(xc, (uint8_t*)&host_mem,
addr, size, flags, res, byte_enable);
if (fault == NoFault && res != NULL) {
if (flags & Request::MEM_SWAP || flags & Request::MEM_SWAP_COND)
*(MemT *)res = gtoh(*(MemT *)res, Order);
else
*res = gtoh(*res, Order);
}
return fault;
}
template <class XC, class MemT>
Fault
writeMemAtomicLE(XC *xc, trace::InstRecord *traceData, const MemT &mem,
@@ -223,6 +295,15 @@ writeMemAtomicLE(XC *xc, trace::InstRecord *traceData, const MemT &mem,
xc, traceData, mem, addr, flags, res);
}
template <class XC, class MemT>
Fault
writeMemAtomicLE(XC *xc, trace::InstRecord *traceData, const MemT &mem,
size_t size, Addr addr, Request::Flags flags, uint64_t *res)
{
return writeMemAtomic<ByteOrder::little>(
xc, traceData, mem, addr, size, flags, res);
}
template <class XC, class MemT>
Fault
writeMemAtomicBE(XC *xc, trace::InstRecord *traceData, const MemT &mem,

10
src/arch/riscv/isa/templates/vector_mem.isa
View File

@@ -562,7 +562,7 @@ Fault
}
Fault fault = writeMemAtomicLE(xc, traceData, *(vreg_t::Container*)(&Mem),
EA, memAccessFlags, nullptr);
vlenb, EA, memAccessFlags, nullptr);
return fault;
}
@@ -592,7 +592,7 @@ Fault
}
Fault fault = writeMemTimingLE(xc, traceData, *(vreg_t::Container*)(&Mem),
EA, memAccessFlags, nullptr);
EA, vlenb, memAccessFlags, nullptr);
return fault;
}
@@ -689,7 +689,8 @@ Fault
%(ea_code)s;
Fault fault = readMemAtomicLE(xc, traceData, EA,
*(vreg_t::Container*)(&Mem), memAccessFlags);
*(vreg_t::Container*)(&Mem), vlenb,
memAccessFlags);
if (fault != NoFault)
return fault;
@@ -722,7 +723,8 @@ Fault
%(set_vlenb)s;
%(ea_code)s;
Fault fault = initiateMemRead(xc, traceData, EA, Mem, memAccessFlags);
const std::vector<bool> byte_enable(vlenb, true);
Fault fault = initiateMemRead(xc, EA, vlenb, memAccessFlags, byte_enable);
return fault;
}