diff options
| author | Sean Wilson <spwilson2@wisc.edu> | 2017-06-07 12:13:16 -0500 |
|---|---|---|
| committer | Sean Wilson <spwilson2@wisc.edu> | 2017-06-20 18:03:21 +0000 |
| commit | ebe5f0df9a6158ec4ed84429d1619f388eb1388b (patch) | |
| tree | c3070d745a0820856a044313860c8edede236be8 /src/gpu-compute | |
| parent | 8421362cc23a6341e44ce59f2c4f578438fd8a55 (diff) | |
| download | gem5-ebe5f0df9a6158ec4ed84429d1619f388eb1388b.tar.xz | |
cpu, gpu-compute: Replace EventWrapper use with EventFunctionWrapper
Change-Id: Idd5992463bcf9154f823b82461070d1f1842cea3
Signed-off-by: Sean Wilson <spwilson2@wisc.edu>
Reviewed-on: https://gem5-review.googlesource.com/3746
Reviewed-by: Anthony Gutierrez <anthony.gutierrez@amd.com>
Reviewed-by: Jason Lowe-Power <jason@lowepower.com>
Maintainer: Jason Lowe-Power <jason@lowepower.com>
Diffstat (limited to 'src/gpu-compute')
| -rw-r--r-- | src/gpu-compute/gpu_tlb.cc | 4 | ||||
| -rw-r--r-- | src/gpu-compute/gpu_tlb.hh | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/gpu-compute/gpu_tlb.cc b/src/gpu-compute/gpu_tlb.cc index 1f1a4cc61..b5411f82c 100644 --- a/src/gpu-compute/gpu_tlb.cc +++ b/src/gpu-compute/gpu_tlb.cc @@ -61,7 +61,9 @@ namespace X86ISA GpuTLB::GpuTLB(const Params *p) : MemObject(p), configAddress(0), size(p->size), - cleanupEvent(this, false, Event::Maximum_Pri), exitEvent(this) + cleanupEvent([this]{ cleanup(); }, name(), false, + Event::Maximum_Pri), + exitEvent([this]{ exitCallback(); }, name()) { assoc = p->assoc; assert(assoc <= size); diff --git a/src/gpu-compute/gpu_tlb.hh b/src/gpu-compute/gpu_tlb.hh index 7a7485c48..ee4375259 100644 --- a/src/gpu-compute/gpu_tlb.hh +++ b/src/gpu-compute/gpu_tlb.hh @@ -425,7 +425,7 @@ namespace X86ISA // free memory and do the required clean-up void cleanup(); - EventWrapper<GpuTLB, &GpuTLB::cleanup> cleanupEvent; + EventFunctionWrapper cleanupEvent; /** * This hash map will use the virtual page address as a key @@ -458,7 +458,7 @@ namespace X86ISA // Called at the end of simulation to dump page access stats. void exitCallback(); - EventWrapper<GpuTLB, &GpuTLB::exitCallback> exitEvent; + EventFunctionWrapper exitEvent; }; } |