[flang-commits] [flang] [openmp] Add memory diff dump for kernel record-replay (PR #70667)
via flang-commits
flang-commits at lists.llvm.org
Mon Oct 30 10:40:59 PDT 2023
https://github.com/nmustakin updated https://github.com/llvm/llvm-project/pull/70667
>From 153c6d812939cd23bb71e53c71378117ed5b23c7 Mon Sep 17 00:00:00 2001
From: Nafis Mustakin <nmust004 at ucr.edu>
Date: Mon, 30 Oct 2023 07:50:59 -0700
Subject: [PATCH 1/3] Add memory diff dump for kernel record-replay
---
.../PluginInterface/PluginInterface.cpp | 65 +++++++++++++++----
1 file changed, 54 insertions(+), 11 deletions(-)
diff --git a/openmp/libomptarget/plugins-nextgen/common/PluginInterface/PluginInterface.cpp b/openmp/libomptarget/plugins-nextgen/common/PluginInterface/PluginInterface.cpp
index 0243f0205dbf0e5..8469e8eaf1593cd 100644
--- a/openmp/libomptarget/plugins-nextgen/common/PluginInterface/PluginInterface.cpp
+++ b/openmp/libomptarget/plugins-nextgen/common/PluginInterface/PluginInterface.cpp
@@ -83,7 +83,7 @@ struct RecordReplayTy {
return Plugin::success();
}
- void dumpDeviceMemory(StringRef Filename) {
+ void dumpDeviceMemory(StringRef Filename, bool saveDiff) {
ErrorOr<std::unique_ptr<WritableMemoryBuffer>> DeviceMemoryMB =
WritableMemoryBuffer::getNewUninitMemBuffer(MemorySize);
if (!DeviceMemoryMB)
@@ -93,15 +93,58 @@ struct RecordReplayTy {
MemoryStart, MemorySize, nullptr);
if (Err)
report_fatal_error("Error retrieving data for target pointer");
-
- StringRef DeviceMemory(DeviceMemoryMB.get()->getBufferStart(), MemorySize);
- std::error_code EC;
- raw_fd_ostream OS(Filename, EC);
- if (EC)
+
+ std::error_code EC;
+ raw_fd_ostream OS(Filename, EC);
+ if(EC)
report_fatal_error("Error dumping memory to file " + Filename + " :" +
EC.message());
- OS << DeviceMemory;
- OS.close();
+
+ if (saveDiff){
+ //Get the pre-record memory filename
+ SmallString<128> InputFilename = {Filename.split('.').first, ".memory"};
+ //read the pre-record memorydump
+ auto InputFileBuffer = MemoryBuffer::getFileOrSTDIN(InputFilename);
+ if(std::error_code EC = InputFileBuffer.getError())
+ report_fatal_error("Error reading pre-record device memory");
+
+ StringRef InputBufferContents = (*InputFileBuffer)->getBuffer();
+ if(InputBufferContents.size() != MemorySize)
+ report_fatal_error("Error: Pre-record device memory size mismatch");
+
+ //get current memory contents
+ StringRef DeviceMemoryContents(DeviceMemoryMB.get()->getBuffer().data(),
+ DeviceMemoryMB.get()->getBuffer().size());
+
+ //compare pre-record memorydump to current contents
+ size_t i = 0;
+ while(i < MemorySize){
+ //if mismatch found, create a new diff line
+ //current format - location, size, differences ...
+ if(InputBufferContents[i] != DeviceMemoryContents[i]){
+ OS << i << " "; //marks the start offset
+ SmallVector<uint8_t, 128> modified;
+ modified.push_back(DeviceMemoryContents[i]);
+ size_t j = 1;
+ //loop until next match is found
+ while(InputBufferContents[i+j] != DeviceMemoryContents[i+j]){
+ modified.push_back(DeviceMemoryContents[i+j]);
+ j++;
+ }
+ OS << j << " "; //marks the length of the mismatching sequence
+ for(const auto &value : modified)
+ OS << value << " ";
+ OS << "\n";
+ i+=j+1;
+ }
+ else i++;
+ }
+ }
+ else {
+ StringRef DeviceMemory(DeviceMemoryMB.get()->getBufferStart(), MemorySize);
+ OS << DeviceMemory;
+ }
+ OS.close();
}
public:
@@ -209,7 +252,7 @@ struct RecordReplayTy {
JsonKernelInfo["ArgOffsets"] = json::Value(std::move(JsonArgOffsets));
SmallString<128> MemoryFilename = {Name, ".memory"};
- dumpDeviceMemory(MemoryFilename);
+ dumpDeviceMemory(MemoryFilename, false);
SmallString<128> GlobalsFilename = {Name, ".globals"};
dumpGlobals(GlobalsFilename, Image);
@@ -227,7 +270,7 @@ struct RecordReplayTy {
void saveKernelOutputInfo(const char *Name) {
SmallString<128> OutputFilename = {
Name, (isRecording() ? ".original.output" : ".replay.output")};
- dumpDeviceMemory(OutputFilename);
+ dumpDeviceMemory(OutputFilename, true);
}
void *alloc(uint64_t Size) {
@@ -1307,7 +1350,7 @@ Error GenericDeviceTy::launchKernel(void *EntryPtr, void **ArgPtrs,
GenericKernel.getName(), GenericKernel.getImage(), ArgPtrs, ArgOffsets,
KernelArgs.NumArgs, KernelArgs.NumTeams[0], KernelArgs.ThreadLimit[0],
KernelArgs.Tripcount);
-
+
if (RecordReplay.isRecording())
RecordReplay.saveImage(GenericKernel.getName(), GenericKernel.getImage());
>From 8daffad57074dd09287d321acd79c74a667eb65f Mon Sep 17 00:00:00 2001
From: Nafis Mustakin <nmust004 at ucr.edu>
Date: Mon, 30 Oct 2023 08:39:40 -0700
Subject: [PATCH 2/3] Fix clang-formatting issues, accept reviewed suggestions
---
.../PluginInterface/PluginInterface.cpp | 78 +++++++++----------
1 file changed, 39 insertions(+), 39 deletions(-)
diff --git a/openmp/libomptarget/plugins-nextgen/common/PluginInterface/PluginInterface.cpp b/openmp/libomptarget/plugins-nextgen/common/PluginInterface/PluginInterface.cpp
index ae279d436646d9d..745dacbe361afd3 100644
--- a/openmp/libomptarget/plugins-nextgen/common/PluginInterface/PluginInterface.cpp
+++ b/openmp/libomptarget/plugins-nextgen/common/PluginInterface/PluginInterface.cpp
@@ -140,58 +140,58 @@ struct RecordReplayTy {
MemoryStart, MemorySize, nullptr);
if (Err)
report_fatal_error("Error retrieving data for target pointer");
-
- std::error_code EC;
- raw_fd_ostream OS(Filename, EC);
- if(EC)
+
+ std::error_code EC;
+ raw_fd_ostream OS(Filename, EC);
+ if (EC)
report_fatal_error("Error dumping memory to file " + Filename + " :" +
EC.message());
-
- if (saveDiff){
- //Get the pre-record memory filename
+
+ if (saveDiff) {
+ // Get the pre-record memory filename
SmallString<128> InputFilename = {Filename.split('.').first, ".memory"};
- //read the pre-record memorydump
- auto InputFileBuffer = MemoryBuffer::getFileOrSTDIN(InputFilename);
- if(std::error_code EC = InputFileBuffer.getError())
+ // read the pre-record memorydump
+ auto InputFileBuffer = MemoryBuffer::getFileOrSTDIN(InputFilename);
+ if (std::error_code EC = InputFileBuffer.getError())
report_fatal_error("Error reading pre-record device memory");
-
- StringRef InputBufferContents = (*InputFileBuffer)->getBuffer();
- if(InputBufferContents.size() != MemorySize)
+
+ StringRef InputBufferContents = (*InputFileBuffer)->getBuffer();
+ if (InputBufferContents.size() != MemorySize)
report_fatal_error("Error: Pre-record device memory size mismatch");
-
- //get current memory contents
+
+ // get current memory contents
StringRef DeviceMemoryContents(DeviceMemoryMB.get()->getBuffer().data(),
DeviceMemoryMB.get()->getBuffer().size());
-
- //compare pre-record memorydump to current contents
+
+ // compare pre-record memorydump to current contents
size_t i = 0;
- while(i < MemorySize){
- //if mismatch found, create a new diff line
- //current format - location, size, differences ...
- if(InputBufferContents[i] != DeviceMemoryContents[i]){
- OS << i << " "; //marks the start offset
- SmallVector<uint8_t, 128> modified;
+ while (i < MemorySize) {
+ // if mismatch found, create a new diff line
+ // current format - location, size, differences ...
+ if (InputBufferContents[i] != DeviceMemoryContents[i]) {
+ OS << i << " "; // marks the start offset
+ SmallVector<uint8_t, 128> modified;
modified.push_back(DeviceMemoryContents[i]);
size_t j = 1;
- //loop until next match is found
- while(InputBufferContents[i+j] != DeviceMemoryContents[i+j]){
- modified.push_back(DeviceMemoryContents[i+j]);
+ // loop until next match is found
+ while (InputBufferContents[i + j] != DeviceMemoryContents[i + j]) {
+ modified.push_back(DeviceMemoryContents[i + j]);
j++;
}
- OS << j << " "; //marks the length of the mismatching sequence
- for(const auto &value : modified)
+ OS << j << " "; // marks the length of the mismatching sequence
+ for (const auto &value : modified)
OS << value << " ";
- OS << "\n";
- i+=j+1;
- }
- else i++;
+ OS << "\n";
+ i += j + 1;
+ } else
+ i++;
}
- }
- else {
- StringRef DeviceMemory(DeviceMemoryMB.get()->getBufferStart(), MemorySize);
+ } else {
+ StringRef DeviceMemory(DeviceMemoryMB.get()->getBufferStart(),
+ MemorySize);
OS << DeviceMemory;
}
- OS.close();
+ OS.close();
}
public:
@@ -299,7 +299,7 @@ struct RecordReplayTy {
JsonKernelInfo["ArgOffsets"] = json::Value(std::move(JsonArgOffsets));
SmallString<128> MemoryFilename = {Name, ".memory"};
- dumpDeviceMemory(MemoryFilename, false);
+ dumpDeviceMemory(MemoryFilename, /*saveDiff*/false);
SmallString<128> GlobalsFilename = {Name, ".globals"};
dumpGlobals(GlobalsFilename, Image);
@@ -317,7 +317,7 @@ struct RecordReplayTy {
void saveKernelOutputInfo(const char *Name) {
SmallString<128> OutputFilename = {
Name, (isRecording() ? ".original.output" : ".replay.output")};
- dumpDeviceMemory(OutputFilename, true);
+ dumpDeviceMemory(OutputFilename, /*saveDiff*/true);
}
void *alloc(uint64_t Size) {
@@ -1396,7 +1396,7 @@ Error GenericDeviceTy::launchKernel(void *EntryPtr, void **ArgPtrs,
GenericKernel.getName(), GenericKernel.getImage(), ArgPtrs, ArgOffsets,
KernelArgs.NumArgs, KernelArgs.NumTeams[0], KernelArgs.ThreadLimit[0],
KernelArgs.Tripcount);
-
+
if (RecordReplay.isRecording())
RecordReplay.saveImage(GenericKernel.getName(), GenericKernel.getImage());
>From 20a92632761639afd95496d2012c5cf8471d622e Mon Sep 17 00:00:00 2001
From: Nafis Mustakin <nmust004 at ucr.edu>
Date: Mon, 30 Oct 2023 10:34:32 -0700
Subject: [PATCH 3/3] Fix formatting issues
---
.../common/PluginInterface/PluginInterface.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/openmp/libomptarget/plugins-nextgen/common/PluginInterface/PluginInterface.cpp b/openmp/libomptarget/plugins-nextgen/common/PluginInterface/PluginInterface.cpp
index 745dacbe361afd3..2a7f354a2d5b030 100644
--- a/openmp/libomptarget/plugins-nextgen/common/PluginInterface/PluginInterface.cpp
+++ b/openmp/libomptarget/plugins-nextgen/common/PluginInterface/PluginInterface.cpp
@@ -118,7 +118,7 @@ struct RecordReplayTy {
return Plugin::success();
}
-
+
Error preallocateDeviceMemory(uint64_t DeviceMemorySize, void *ReqVAddr) {
if (Device->supportVAManagement())
return preAllocateVAMemory(DeviceMemorySize, ReqVAddr);
@@ -299,7 +299,7 @@ struct RecordReplayTy {
JsonKernelInfo["ArgOffsets"] = json::Value(std::move(JsonArgOffsets));
SmallString<128> MemoryFilename = {Name, ".memory"};
- dumpDeviceMemory(MemoryFilename, /*saveDiff*/false);
+ dumpDeviceMemory(MemoryFilename, /*saveDiff*/ false);
SmallString<128> GlobalsFilename = {Name, ".globals"};
dumpGlobals(GlobalsFilename, Image);
@@ -317,7 +317,7 @@ struct RecordReplayTy {
void saveKernelOutputInfo(const char *Name) {
SmallString<128> OutputFilename = {
Name, (isRecording() ? ".original.output" : ".replay.output")};
- dumpDeviceMemory(OutputFilename, /*saveDiff*/true);
+ dumpDeviceMemory(OutputFilename, /*saveDiff*/ true);
}
void *alloc(uint64_t Size) {
More information about the flang-commits
mailing list