Builder builds MMU

driver/memory.go

@@ -77,6 +77,7 @@ func (d *Driver) allocatePage() {
 		for _, p := range d.allocatedPages[d.usingGPU] {
 			if p.PhysicalFrameNumber == pageID {
 				pageIDAllocated = true
+				pageID += 1 << d.PageSizeAsPowerOf2
 				break
 			}
 		}

emu/computeunit.go

@@ -276,7 +276,7 @@ func (cu *ComputeUnit) runWfUntilBarrier(wf *Wavefront) error {
 	for {
 		instBuf, err := cu.GlobalMemStorage.Read(wf.PC, 8)
 		if err != nil {
-			log.Fatal(err)
+			log.Panic(err)
 		}
 
 		inst, err := cu.decoder.Decode(instBuf)

platform/build.go

 package platform
 
 import (
+	"log"
+	"os"
+
 	"gitlab.com/akita/akita"
 	"gitlab.com/akita/gcn3"
 	"gitlab.com/akita/gcn3/driver"
 	"gitlab.com/akita/gcn3/gpubuilder"
 	"gitlab.com/akita/mem"
+	"gitlab.com/akita/mem/vm"
 )
 
 var UseParallelEngine bool
@@ -27,9 +31,10 @@ func BuildEmuPlatform() (
 	} else {
 		engine = akita.NewSerialEngine()
 	}
-	//engine.AcceptHook(akita.NewEventLogger(log.New(os.Stdout, "", 0)))
+	engine.AcceptHook(akita.NewEventLogger(log.New(os.Stdout, "", 0)))
 
-	gpuDriver := driver.NewDriver(engine)
+	mmu := vm.NewMMU("MMU", engine)
+	gpuDriver := driver.NewDriver(engine, mmu)
 	connection := akita.NewDirectConnection(engine)
 
 	gpuBuilder := gpubuilder.NewGPUBuilder(engine)
@@ -66,7 +71,8 @@ func BuildR9NanoPlatform() (
 	}
 	//engine.AcceptHook(akita.NewEventLogger(log.New(os.Stdout, "", 0)))
 
-	gpuDriver := driver.NewDriver(engine)
+	mmu := vm.NewMMU("MMU", engine)
+	gpuDriver := driver.NewDriver(engine, mmu)
 	connection := akita.NewDirectConnection(engine)
 
 	gpuBuilder := gpubuilder.NewGPUBuilder(engine)