Merge branch 'seperate-gmmu-pagetable' of https://github.com/YuWei-CH…

…/mgpusim into seperate-gmmu-pagetable
sarchlab · Dec 5, 2024 · fb0872a · fb0872a
2 parents 08a802b + 146e85c
commit fb0872a
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 19 deletions.
diff --git a/driver/driver.go b/driver/driver.go
@@ -153,7 +153,7 @@ func (d *Driver) RegisterGPU(
 			CUCount:  properties.CUCount,
 			DRAMSize: properties.DRAMSize,
 		},
-		pageTable: vm.PageTable,
+		PageTable: vm.NewPageTable(d.Log2PageSize),
 	}
 	gpuDevice.SetTotalMemSize(properties.DRAMSize)
 	d.memAllocator.RegisterDevice(gpuDevice)

diff --git a/driver/internal/device.go b/driver/internal/device.go
@@ -40,7 +40,7 @@ type Device struct {
 	nextActualGPUIndex int
 	MemState           DeviceMemoryState
 	Properties         DeviceProperties
-	pageTable          vm.PageTable
+	PageTable          vm.PageTable
 }
 
 // SetTotalMemSize sets total memory size

diff --git a/driver/internal/memoryallocator.go b/driver/internal/memoryallocator.go
@@ -64,7 +64,7 @@ func (a *memoryAllocatorImpl) RegisterDevice(device *Device) {
 	state := device.MemState
 	state.setInitialAddress(a.totalStorageByteSize)
 	a.totalStorageByteSize += state.getStorageSize()
-	device.pageTable = vm.NewPageTable(a.log2PageSize)
+	device.PageTable = vm.NewPageTable(a.log2PageSize)
 	a.devices[device.ID] = device
 }
 
@@ -162,7 +162,7 @@ func (a *memoryAllocatorImpl) allocatePages(
 
 		// fmt.Printf("page.addr is %x piage Device ID is %d \n", page.PAddr, page.DeviceID)
 		// debug.PrintStack()
-		device.pageTable.Insert(page)
+		device.PageTable.Insert(page)
 		a.vAddrToPageMapping[page.VAddr] = page
 	}
 
@@ -189,7 +189,7 @@ func (a *memoryAllocatorImpl) Remap(
 	device := a.devices[deviceID]
 	pages := a.allocateMultiplePagesWithGivenVAddrs(pid, deviceID, vAddrs, false)
 	for _, page := range pages {
-		device.pageTable.Insert(page)
+		device.PageTable.Insert(page)
 	}
 }
 
@@ -246,7 +246,7 @@ func (a *memoryAllocatorImpl) allocatePageWithGivenVAddr(
 		DeviceID: uint64(deviceID),
 		Unified:  isUnified,
 	}
-	device.pageTable.Insert(page)
+	device.PageTable.Insert(page)
 	a.vAddrToPageMapping[page.VAddr] = page
 
 	return page

diff --git a/go.work b/go.work
diff --git a/go.work.sum b/go.work.sum