From b26ab38917ab2295ae159a2b637dd7a5797f00ca Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 16:08:45 -0400 Subject: [PATCH 1/5] Bump golang.org/x/image from 0.15.0 to 0.18.0 (#77) Bumps [golang.org/x/image](https://github.com/golang/image) from 0.15.0 to 0.18.0. - [Commits](https://github.com/golang/image/compare/v0.15.0...v0.18.0) --- updated-dependencies: - dependency-name: golang.org/x/image dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 10 +++++----- go.sum | 20 ++++++++++---------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/go.mod b/go.mod index 38e45198..f2b366cc 100644 --- a/go.mod +++ b/go.mod @@ -31,11 +31,11 @@ require ( github.com/tklauser/go-sysconf v0.3.13 // indirect github.com/tklauser/numcpus v0.7.0 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect - golang.org/x/image v0.15.0 // indirect - golang.org/x/net v0.22.0 // indirect - golang.org/x/sys v0.18.0 // indirect - golang.org/x/text v0.14.0 // indirect - golang.org/x/tools v0.19.0 // indirect + golang.org/x/image v0.18.0 // indirect + golang.org/x/net v0.25.0 // indirect + golang.org/x/sys v0.20.0 // indirect + golang.org/x/text v0.16.0 // indirect + golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index 31f8db47..d28c9fe3 100644 --- a/go.sum +++ b/go.sum @@ -73,14 +73,14 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U golang.org/x/exp v0.0.0-20230321023759-10a507213a29 h1:ooxPy7fPvB4kwsA2h+iBNHkAbp/4JxTSwCmvdjEYmug= golang.org/x/exp v0.0.0-20230321023759-10a507213a29/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= -golang.org/x/image v0.15.0 h1:kOELfmgrmJlw4Cdb7g/QGuB3CvDrXbqEIww/pNtNBm8= -golang.org/x/image v0.15.0/go.mod h1:HUYqC05R2ZcZ3ejNQsIHQDQiwWM4JBqmm6MKANTp4LE= +golang.org/x/image v0.18.0 h1:jGzIakQa/ZXI1I0Fxvaa9W7yP25TqT6cHIHn+6CqvSQ= +golang.org/x/image v0.18.0/go.mod h1:4yyo5vMFQjVjUcVk4jEQcU9MGy/rulF5WvUILseCM2E= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= -golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc= -golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= +golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac= +golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -92,18 +92,18 @@ golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= -golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= +golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= -golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= +golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.19.0 h1:tfGCXNR1OsFG+sVdLAitlpjAvD/I6dHDKnYrpEZUHkw= -golang.org/x/tools v0.19.0/go.mod h1:qoJWxmGSIBmAeriMx19ogtrEPrGtDbPK634QFIcLAhc= +golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg= +golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= From 5d49f873df5279182500c6878935c3207a013e59 Mon Sep 17 00:00:00 2001 From: Daoxuan Xu <101349164+DX990307@users.noreply.github.com> Date: Fri, 5 Jul 2024 14:43:29 -0400 Subject: [PATCH 2/5] fix bug (#79) --- samples/runner/report.go | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/samples/runner/report.go b/samples/runner/report.go index cd40f6f1..16f531bb 100644 --- a/samples/runner/report.go +++ b/samples/runner/report.go @@ -69,12 +69,21 @@ func (r *Runner) defineMetrics() { } func (r *Runner) addKernelTimeTracer() { - r.kernelTimeCounter = tracing.NewBusyTimeTracer( - r.platform.Engine, - func(task tracing.Task) bool { - return task.What == "*driver.LaunchKernelCommand" - }) - tracing.CollectTrace(r.platform.Driver, r.kernelTimeCounter) + if *unifiedGPUFlag != "" { + r.kernelTimeCounter = tracing.NewBusyTimeTracer( + r.platform.Engine, + func(task tracing.Task) bool { + return task.What == "*driver.LaunchUnifiedMultiGPUKernelCommand" + }) + tracing.CollectTrace(r.platform.Driver, r.kernelTimeCounter) + } else { + r.kernelTimeCounter = tracing.NewBusyTimeTracer( + r.platform.Engine, + func(task tracing.Task) bool { + return task.What == "*driver.LaunchKernelCommand" + }) + tracing.CollectTrace(r.platform.Driver, r.kernelTimeCounter) + } for _, gpu := range r.platform.GPUs { gpuKernelTimeCounter := tracing.NewBusyTimeTracer( From 4be03e20da4223d53d14079e9ef74943ded98761 Mon Sep 17 00:00:00 2001 From: Mahdi Ali nejad <109273848+Soilorian@users.noreply.github.com> Date: Fri, 30 Aug 2024 17:01:42 +0330 Subject: [PATCH 3/5] Update report.go (#90) fix issue with the incorrect access count --- samples/runner/report.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/runner/report.go b/samples/runner/report.go index 16f531bb..07c50c78 100644 --- a/samples/runner/report.go +++ b/samples/runner/report.go @@ -469,10 +469,10 @@ func (r *Runner) reportCacheHitRate() { for _, tracer := range r.cacheHitRateTracers { readHit := tracer.tracer.GetStepCount("read-hit") readMiss := tracer.tracer.GetStepCount("read-miss") - readMSHRHit := tracer.tracer.GetStepCount("read-mshr-miss") + readMSHRHit := tracer.tracer.GetStepCount("read-mshr-hit") writeHit := tracer.tracer.GetStepCount("write-hit") writeMiss := tracer.tracer.GetStepCount("write-miss") - writeMSHRHit := tracer.tracer.GetStepCount("write-mshr-miss") + writeMSHRHit := tracer.tracer.GetStepCount("write-mshr-hit") totalTransaction := readHit + readMiss + readMSHRHit + writeHit + writeMiss + writeMSHRHit From 1596eeab6f73a98dbc435d2cca51afba1e9fc998 Mon Sep 17 00:00:00 2001 From: Ali Mosallaei Date: Sun, 6 Oct 2024 15:12:41 -0400 Subject: [PATCH 4/5] Disable RTM flag push (#91) --- samples/runner/flag.go | 1 + samples/runner/runner.go | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/samples/runner/flag.go b/samples/runner/flag.go index 8a3287a4..53763080 100644 --- a/samples/runner/flag.go +++ b/samples/runner/flag.go @@ -45,6 +45,7 @@ var customPortForAkitaRTM = flag.Int("akitartm-port", 0, `Custom port to host AkitaRTM. A 4-digit or 5-digit port number is required. If this number is not given or a invalid number is given number, a random port will be used.`) +var disableAkitaRTM = flag.Bool("disable-rtm", false, "Disable the AkitaRTM monitoring portal") var analyszerNameFlag = flag.String("analyzer-name", "", "The name of the analyzer to use.") diff --git a/samples/runner/runner.go b/samples/runner/runner.go index 71f15c72..77839b01 100644 --- a/samples/runner/runner.go +++ b/samples/runner/runner.go @@ -143,7 +143,9 @@ func (r *Runner) buildTimingPlatform() { r.platform = b.Build() - r.monitor.StartServer() + if !*disableAkitaRTM { + r.monitor.StartServer() + } } func (*Runner) setAnalyszer( From 383c963d2c980eeaf79db0c88ca30e60ce806293 Mon Sep 17 00:00:00 2001 From: Yifan Sun Date: Mon, 21 Oct 2024 09:58:58 -0400 Subject: [PATCH 5/5] Include instruction on how to use modified Akita in readme (#103) --- README.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/README.md b/README.md index 126cf611..c47a1a9c 100644 --- a/README.md +++ b/README.md @@ -20,6 +20,16 @@ MGPUSim is a high-flexibility, high-performance, high-accuracy GPU simulator. It - Run the simulation with `./fir -timing --report-all` to run the simulation. - Check the generated `metrics.csv` file for high-level metrics output. +## Develop with Modified Version of Akita (or other depending libraries) + +If a modification to Akita is required, you can clone Akita next to the MGPUSim directory in your system. Then, you can modify the `go.mod` file to include the following line. + +``` +replace github.com/sarchlab/akita/v3 => ../akita +``` + +This line will direct the go compiler to use your local version of Akita rather than the official release of Akita. + ## Benchmark Support | AMD APP SDK | DNN Mark | HeteroMark | Polybench | Rodinia | SHOC |