wu-arch/vortex
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

automatic perf dump fix

Browse Source
This commit is contained in:
Blaise Tine
2021-08-13 19:23:13 -07:00
parent 3c43308e71
commit 36d95fd892
3 changed files with 39 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
driver/opae/vortex.cpp
View File

@@ -79,18 +79,17 @@ inline bool is_aligned(size_t addr, size_t alignment) {
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
class AutoDeviceCleanup { #ifdef DUMP_PERF_STATS
class AutoPerfDump {
private: private:
std::list<vx_device_h> devices_; std::list<vx_device_h> devices_;
public: public:
AutoDeviceCleanup() {} AutoPerfDump() {}
~AutoDeviceCleanup() { ~AutoPerfDump() {
for (auto it = devices_.begin(), it_end = devices_.end(); it != it_end;) { for (auto device : devices_) {
auto device = *it; vx_dump_perf(device, stdout);
it = devices_.erase(it);
vx_dev_close(device);
} }
} }
@@ -103,7 +102,8 @@ public:
} }
}; };
AutoDeviceCleanup gAutoDeviceCleanup; AutoPerfDump gAutoPerfDump;
#endif
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
@@ -252,7 +252,9 @@ extern int vx_dev_open(vx_device_h* hdevice) {
*hdevice = device; *hdevice = device;
gAutoDeviceCleanup.add_device(device); #ifdef DUMP_PERF_STATS
gAutoPerfDump.add_device(*hdevice);
#endif
return 0; return 0;
} }
@@ -261,8 +263,6 @@ extern int vx_dev_close(vx_device_h hdevice) {
if (nullptr == hdevice) if (nullptr == hdevice)
return -1; return -1;
gAutoDeviceCleanup.remove_device(hdevice);
vx_device_t *device = ((vx_device_t*)hdevice); vx_device_t *device = ((vx_device_t*)hdevice);
#ifdef SCOPE #ifdef SCOPE
@@ -270,7 +270,8 @@ extern int vx_dev_close(vx_device_h hdevice) {
#endif #endif
#ifdef DUMP_PERF_STATS #ifdef DUMP_PERF_STATS
vx_dump_perf(device, stdout); gAutoPerfDump.remove_device(hdevice);
vx_dump_perf(hdevice, stdout);
#endif #endif
fpgaClose(device->fpga); fpgaClose(device->fpga);

25
driver/rtlsim/vortex.cpp
View File

@@ -154,18 +154,17 @@ private:
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
class AutoDeviceCleanup { #ifdef DUMP_PERF_STATS
class AutoPerfDump {
private: private:
std::list<vx_device_h> devices_; std::list<vx_device_h> devices_;
public: public:
AutoDeviceCleanup() {} AutoPerfDump() {}
~AutoDeviceCleanup() { ~AutoPerfDump() {
for (auto it = devices_.begin(), it_end = devices_.end(); it != it_end;) { for (auto device : devices_) {
auto device = *it; vx_dump_perf(device, stdout);
it = devices_.erase(it);
vx_dev_close(device);
} }
} }
@@ -178,7 +177,8 @@ public:
} }
}; };
AutoDeviceCleanup gAutoDeviceCleanup; AutoPerfDump gAutoPerfDump;
#endif
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
@@ -226,7 +226,9 @@ extern int vx_dev_open(vx_device_h* hdevice) {
*hdevice = new vx_device(); *hdevice = new vx_device();
gAutoDeviceCleanup.add_device(*hdevice); #ifdef DUMP_PERF_STATS
gAutoPerfDump.add_device(*hdevice);
#endif
return 0; return 0;
} }
@@ -235,12 +237,11 @@ extern int vx_dev_close(vx_device_h hdevice) {
if (nullptr == hdevice) if (nullptr == hdevice)
return -1; return -1;
gAutoDeviceCleanup.remove_device(hdevice);
vx_device *device = ((vx_device*)hdevice); vx_device *device = ((vx_device*)hdevice);
#ifdef DUMP_PERF_STATS #ifdef DUMP_PERF_STATS
vx_dump_perf(device, stdout); gAutoPerfDump.remove_device(hdevice);
vx_dump_perf(hdevice, stdout);
#endif #endif
delete device; delete device;

25
driver/simx/vortex.cpp
View File

@@ -223,18 +223,17 @@ private:
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
class AutoDeviceCleanup { #ifdef DUMP_PERF_STATS
class AutoPerfDump {
private: private:
std::list<vx_device_h> devices_; std::list<vx_device_h> devices_;
public: public:
AutoDeviceCleanup() {} AutoPerfDump() {}
~AutoDeviceCleanup() { ~AutoPerfDump() {
for (auto it = devices_.begin(), it_end = devices_.end(); it != it_end;) { for (auto device : devices_) {
auto device = *it; vx_dump_perf(device, stdout);
it = devices_.erase(it);
vx_dev_close(device);
} }
} }
@@ -247,7 +246,8 @@ public:
} }
}; };
AutoDeviceCleanup gAutoDeviceCleanup; AutoPerfDump gAutoPerfDump;
#endif
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
@@ -257,7 +257,9 @@ extern int vx_dev_open(vx_device_h* hdevice) {
*hdevice = new vx_device(); *hdevice = new vx_device();
gAutoDeviceCleanup.add_device(*hdevice); #ifdef DUMP_PERF_STATS
gAutoPerfDump.add_device(*hdevice);
#endif
return 0; return 0;
} }
@@ -266,12 +268,11 @@ extern int vx_dev_close(vx_device_h hdevice) {
if (nullptr == hdevice) if (nullptr == hdevice)
return -1; return -1;
gAutoDeviceCleanup.remove_device(hdevice);
vx_device *device = ((vx_device*)hdevice); vx_device *device = ((vx_device*)hdevice);
#ifdef DUMP_PERF_STATS #ifdef DUMP_PERF_STATS
vx_dump_perf(device, stdout); gAutoPerfDump.remove_device(hdevice);
vx_dump_perf(hdevice, stdout);
#endif #endif
delete device; delete device;