Daniel Carvalho has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/43585 )
Change subject: dev-hsa: Fix includes
......................................................................
dev-hsa: Fix includes
Partial fix of includes of the files in src/dev/hsa.
It is a partial fix because there might still be
some transitive dependencies - i.e., this process
was not automated.
Change-Id: Ib2f197fc7c97ed1c828c99b2584693cf03b31361
Signed-off-by: Daniel R. Carvalho <oda...@yahoo.com.br>
---
M src/dev/hsa/hsa_device.hh
M src/dev/hsa/hsa_driver.cc
M src/dev/hsa/hsa_driver.hh
M src/dev/hsa/hsa_packet.hh
M src/dev/hsa/hsa_signal.hh
M src/dev/hsa/hw_scheduler.cc
M src/dev/hsa/hw_scheduler.hh
M src/dev/hsa/kfd_ioctl.h
8 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/src/dev/hsa/hsa_device.hh b/src/dev/hsa/hsa_device.hh
index cd1fa3d..157c459 100644
--- a/src/dev/hsa/hsa_device.hh
+++ b/src/dev/hsa/hsa_device.hh
@@ -34,6 +34,11 @@
#ifndef __DEV_HSA_HSA_DEVICE_HH__
#define __DEV_HSA_HSA_DEVICE_HH__
+#include <cassert>
+#include <cstdint>
+
+#include "base/logging.hh"
+#include "base/types.hh"
#include "dev/dma_device.hh"
#include "dev/hsa/hsa_packet_processor.hh"
#include "params/HSADevice.hh"
diff --git a/src/dev/hsa/hsa_driver.cc b/src/dev/hsa/hsa_driver.cc
index 827fe73..db31cbc 100644
--- a/src/dev/hsa/hsa_driver.cc
+++ b/src/dev/hsa/hsa_driver.cc
@@ -33,7 +33,7 @@
#include "dev/hsa/hsa_driver.hh"
-#include "cpu/thread_context.hh"
+#include "base/trace.hh"
#include "debug/HSADriver.hh"
#include "dev/hsa/hsa_device.hh"
#include "dev/hsa/hsa_packet_processor.hh"
diff --git a/src/dev/hsa/hsa_driver.hh b/src/dev/hsa/hsa_driver.hh
index 13119a5..c231625 100644
--- a/src/dev/hsa/hsa_driver.hh
+++ b/src/dev/hsa/hsa_driver.hh
@@ -48,15 +48,18 @@
#ifndef __DEV_HSA_HSA_DRIVER_HH__
#define __DEV_HSA_HSA_DRIVER_HH__
+#include <cassert>
+#include <cstdint>
+#include <set>
#include <unordered_map>
+#include "base/logging.hh"
#include "base/types.hh"
#include "cpu/thread_context.hh"
#include "sim/emul_driver.hh"
struct HSADriverParams;
class HSADevice;
-class PortProxy;
class HSADriver : public EmulatedDriver
{
diff --git a/src/dev/hsa/hsa_packet.hh b/src/dev/hsa/hsa_packet.hh
index 813a85b..3551687 100644
--- a/src/dev/hsa/hsa_packet.hh
+++ b/src/dev/hsa/hsa_packet.hh
@@ -36,7 +36,7 @@
#define _HSA_PACKET_TYPE_VENDOR_SPECIFIC 0
-#include <stdint.h>
+#include <cstdint>
typedef struct hsa_packet_header_s {
// TODO: replace with more portable impl based on offset, length
diff --git a/src/dev/hsa/hsa_signal.hh b/src/dev/hsa/hsa_signal.hh
index 2275830..0d10e30 100644
--- a/src/dev/hsa/hsa_signal.hh
+++ b/src/dev/hsa/hsa_signal.hh
@@ -33,6 +33,8 @@
#ifndef DEV_HSA_HSA_SIGNAL_H
#define DEV_HSA_HSA_SIGNAL_H
+#include <cstdint>
+
// AMD Signal Kind Enumeration Values.
typedef int64_t amd_signal_kind64_t;
enum amd_signal_kind_t
diff --git a/src/dev/hsa/hw_scheduler.cc b/src/dev/hsa/hw_scheduler.cc
index 41efe4a..b52e592 100644
--- a/src/dev/hsa/hw_scheduler.cc
+++ b/src/dev/hsa/hw_scheduler.cc
@@ -33,8 +33,10 @@
#include "dev/hsa/hw_scheduler.hh"
+#include "base/compiler.hh"
+#include "base/trace.hh"
#include "debug/HSAPacketProcessor.hh"
-#include "mem/packet_access.hh"
+#include "sim/cur_tick.hh"
#define HWSCHDLR_EVENT_DESCRIPTION_GENERATOR(XEVENT) \
const char* \
diff --git a/src/dev/hsa/hw_scheduler.hh b/src/dev/hsa/hw_scheduler.hh
index 4669c89..f80e893 100644
--- a/src/dev/hsa/hw_scheduler.hh
+++ b/src/dev/hsa/hw_scheduler.hh
@@ -34,7 +34,12 @@
#ifndef __DEV_HSA_HW_SCHEDULER_HH__
#define __DEV_HSA_HW_SCHEDULER_HH__
+#include <cstdint>
+#include <map>
+
+#include "base/types.hh"
#include "dev/hsa/hsa_packet_processor.hh"
+#include "sim/eventq.hh"
// We allocate one PIO page for doorbells and each
// address is 8 bytes
diff --git a/src/dev/hsa/kfd_ioctl.h b/src/dev/hsa/kfd_ioctl.h
index f131ee4..504621c 100644
--- a/src/dev/hsa/kfd_ioctl.h
+++ b/src/dev/hsa/kfd_ioctl.h
@@ -23,8 +23,10 @@
#ifndef KFD_IOCTL_H_INCLUDED
#define KFD_IOCTL_H_INCLUDED
-#include <linux/types.h>
#include <linux/ioctl.h>
+#include <linux/types.h>
+
+#include <cstdint>
#define KFD_IOCTL_MAJOR_VERSION 1
#define KFD_IOCTL_MINOR_VERSION 2
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/43585
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: Ib2f197fc7c97ed1c828c99b2584693cf03b31361
Gerrit-Change-Number: 43585
Gerrit-PatchSet: 1
Gerrit-Owner: Daniel Carvalho <oda...@yahoo.com.br>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
