systemc: Fix TLM related includes.

There are a couple things this CL fixes related to the TLM #includes.

1. Removes #includes of <systemc> and <tlm>. These bring in a header
file from boost which shouldn't be necessary but which some of the
tests (and likely some external code) depends on. We avoid including
those in files built into gem5 itself so that gem5 isn't dependent on
boost.

2. All includes in ext should be relative. That way those headers can
be removed from gem5 and still build, allowing them to be moved over
to or referenced from a foreign codebase which isn't part of gem5.

Change-Id: I76e267385b48cb4fe93aea89ec8319c76465a0a4
Reviewed-on: https://gem5-review.googlesource.com/c/15796
Reviewed-by: Ciro Santilli <ciro.santilli@arm.com>
Maintainer: Gabe Black <gabeblack@google.com>

11 files changed, 44 insertions, 21 deletions

diff --git a/src/systemc/ext/tlm_utils/convenience_socket_bases.h b/src/systemc/ext/tlm_utils/convenience_socket_bases.h
index 8cbfee8d2..8f67f1bdc 100644
--- a/src/systemc/ext/tlm_utils/convenience_socket_bases.h
+++ b/src/systemc/ext/tlm_utils/convenience_socket_bases.h
@@ -19,8 +19,6 @@
 #ifndef __SYSTEMC_EXT_TLM_UTILS_CONVENIENCE_SOCKET_BASES_H__
 #define __SYSTEMC_EXT_TLM_UTILS_CONVENIENCE_SOCKET_BASES_H__
 
-#include <systemc>
-
 namespace sc_core
 {
 
diff --git a/src/systemc/ext/tlm_utils/instance_specific_extensions.h b/src/systemc/ext/tlm_utils/instance_specific_extensions.h
index 4b77ddc0b..01688a564 100644
--- a/src/systemc/ext/tlm_utils/instance_specific_extensions.h
+++ b/src/systemc/ext/tlm_utils/instance_specific_extensions.h
@@ -47,7 +47,7 @@ the extension before/after setting/clearing the extension.
 #ifndef __SYSTEMC_EXT_TLM_UTILS_INSTANCE_SPECIFIC_EXTENSIONS_H__
 #define __SYSTEMC_EXT_TLM_UTILS_INSTANCE_SPECIFIC_EXTENSIONS_H__
 
-#include "tlm_utils/instance_specific_extensions_int.h"
+#include "instance_specific_extensions_int.h"
 
 namespace tlm_utils
 {
diff --git a/src/systemc/ext/tlm_utils/instance_specific_extensions_int.h b/src/systemc/ext/tlm_utils/instance_specific_extensions_int.h
index 7e931e200..a391091a6 100644
--- a/src/systemc/ext/tlm_utils/instance_specific_extensions_int.h
+++ b/src/systemc/ext/tlm_utils/instance_specific_extensions_int.h
@@ -19,7 +19,9 @@
 #ifndef __SYSTEMC_EXT_TLM_UTILS_INSTANCE_SPECIFIC_EXTENSIONS_INT_H__
 #define __SYSTEMC_EXT_TLM_UTILS_INSTANCE_SPECIFIC_EXTENSIONS_INT_H__
 
-#include <tlm>
+#include <vector>
+
+#include "../tlm_core/2/generic_payload/array.hh"
 
 namespace tlm_utils
 {
diff --git a/src/systemc/ext/tlm_utils/multi_passthrough_target_socket.h b/src/systemc/ext/tlm_utils/multi_passthrough_target_socket.h
index a136141cf..4dddac614 100644
--- a/src/systemc/ext/tlm_utils/multi_passthrough_target_socket.h
+++ b/src/systemc/ext/tlm_utils/multi_passthrough_target_socket.h
@@ -19,7 +19,9 @@
 #ifndef __SYSTEMC_EXT_TLM_UTILS_MULTI_PASSTHROUGH_TARGET_SOCKET_H__
 #define __SYSTEMC_EXT_TLM_UTILS_MULTI_PASSTHROUGH_TARGET_SOCKET_H__
 
-#include "tlm_utils/multi_socket_bases.h"
+#include "../core/sc_module.hh"
+#include "../core/sc_port.hh"
+#include "multi_socket_bases.h"
 
 namespace tlm_utils
 {
diff --git a/src/systemc/ext/tlm_utils/multi_socket_bases.h b/src/systemc/ext/tlm_utils/multi_socket_bases.h
index 95ca56adb..e7fb589e1 100644
--- a/src/systemc/ext/tlm_utils/multi_socket_bases.h
+++ b/src/systemc/ext/tlm_utils/multi_socket_bases.h
@@ -21,8 +21,10 @@
 #define __SYSTEMC_EXT_TLM_UTILS_MULTI_SOCKET_BASES_H__
 
 #include <map>
-#include <tlm>
-#include "tlm_utils/convenience_socket_bases.h"
+
+#include "../core/sc_port.hh"
+#include "../tlm_core/2/interfaces/fw_bw_ifs.hh"
+#include "convenience_socket_bases.h"
 
 namespace tlm_utils
 {
diff --git a/src/systemc/ext/tlm_utils/passthrough_target_socket.h b/src/systemc/ext/tlm_utils/passthrough_target_socket.h
index 2e7de85d6..3dfc837f5 100644
--- a/src/systemc/ext/tlm_utils/passthrough_target_socket.h
+++ b/src/systemc/ext/tlm_utils/passthrough_target_socket.h
@@ -20,8 +20,11 @@
 #ifndef __SYSTEMC_EXT_TLM_UTILS_PASSTHROUGH_TARGET_SOCKET_H__
 #define __SYSTEMC_EXT_TLM_UTILS_PASSTHROUGH_TARGET_SOCKET_H__
 
-#include <tlm>
-#include "tlm_utils/convenience_socket_bases.h"
+#include "../core/sc_port.hh"
+#include "../core/sc_time.hh"
+#include "../tlm_core/2/sockets/target_socket.hh"
+#include "../utils/sc_report_handler.hh"
+#include "convenience_socket_bases.h"
 
 namespace tlm_utils
 {
diff --git a/src/systemc/ext/tlm_utils/peq_with_cb_and_phase.h b/src/systemc/ext/tlm_utils/peq_with_cb_and_phase.h
index e924aedce..5d87e8b0b 100644
--- a/src/systemc/ext/tlm_utils/peq_with_cb_and_phase.h
+++ b/src/systemc/ext/tlm_utils/peq_with_cb_and_phase.h
@@ -20,10 +20,14 @@
 #ifndef __SYSTEMC_EXT_TLM_UTILS_PEQ_WITH_CB_AND_PHASE_H__
 #define __SYSTEMC_EXT_TLM_UTILS_PEQ_WITH_CB_AND_PHASE_H__
 
-#include <systemc>
-#include <tlm>
 #include <vector>
 
+#include "../core/sc_main.hh"
+#include "../core/sc_object.hh"
+#include "../core/sc_spawn.hh"
+#include "../core/sc_time.hh"
+#include "../dt/int/sc_nbdefs.hh"
+
 namespace tlm_utils
 {
 
diff --git a/src/systemc/ext/tlm_utils/peq_with_get.h b/src/systemc/ext/tlm_utils/peq_with_get.h
index a341c05cf..b406e6a4d 100644
--- a/src/systemc/ext/tlm_utils/peq_with_get.h
+++ b/src/systemc/ext/tlm_utils/peq_with_get.h
@@ -25,7 +25,11 @@
 #define __SYSTEMC_EXT_TLM_UTILS_PEQ_WITH_GET_H__
 
 #include <map>
-#include <systemc>
+
+#include "../core/sc_event.hh"
+#include "../core/sc_main.hh"
+#include "../core/sc_object.hh"
+#include "../core/sc_time.hh"
 
 namespace tlm_utils
 {
diff --git a/src/systemc/ext/tlm_utils/simple_initiator_socket.h b/src/systemc/ext/tlm_utils/simple_initiator_socket.h
index abeb510e3..6b1dbbf0d 100644
--- a/src/systemc/ext/tlm_utils/simple_initiator_socket.h
+++ b/src/systemc/ext/tlm_utils/simple_initiator_socket.h
@@ -20,9 +20,13 @@
 #ifndef __SYSTEMC_EXT_TLM_UTILS_SIMPLE_INITIATOR_SOCKET_H__
 #define __SYSTEMC_EXT_TLM_UTILS_SIMPLE_INITIATOR_SOCKET_H__
 
-#include <tlm>
-
-#include "tlm_utils/convenience_socket_bases.h"
+#include "../core/sc_module.hh"
+#include "../core/sc_port.hh"
+#include "../tlm_core/2/generic_payload/gp.hh"
+#include "../tlm_core/2/interfaces/fw_bw_ifs.hh"
+#include "../tlm_core/2/sockets/initiator_socket.hh"
+#include "../utils/sc_report_handler.hh"
+#include "convenience_socket_bases.h"
 
 namespace tlm_utils
 {
diff --git a/src/systemc/ext/tlm_utils/simple_target_socket.h b/src/systemc/ext/tlm_utils/simple_target_socket.h
index 7830e2a8b..617ef7c80 100644
--- a/src/systemc/ext/tlm_utils/simple_target_socket.h
+++ b/src/systemc/ext/tlm_utils/simple_target_socket.h
@@ -20,11 +20,15 @@
 #ifndef __SYSTEMC_EXT_TLM_UTILS_SIMPLE_TARGET_SOCKET_H__
 #define __SYSTEMC_EXT_TLM_UTILS_SIMPLE_TARGET_SOCKET_H__
 
-#include <systemc>
-#include <tlm>
-
-#include "tlm_utils/convenience_socket_bases.h"
-#include "tlm_utils/peq_with_get.h"
+#include "../core/sc_event.hh"
+#include "../core/sc_module.hh"
+#include "../core/sc_port.hh"
+#include "../tlm_core/2/generic_payload/gp.hh"
+#include "../tlm_core/2/interfaces/fw_bw_ifs.hh"
+#include "../tlm_core/2/sockets/target_socket.hh"
+#include "../utils/sc_report_handler.hh"
+#include "convenience_socket_bases.h"
+#include "peq_with_get.h"
 
 namespace tlm_utils
 {
diff --git a/src/systemc/ext/tlm_utils/tlm_quantumkeeper.h b/src/systemc/ext/tlm_utils/tlm_quantumkeeper.h
index bad46ad11..0a394dde2 100644
--- a/src/systemc/ext/tlm_utils/tlm_quantumkeeper.h
+++ b/src/systemc/ext/tlm_utils/tlm_quantumkeeper.h
@@ -20,7 +20,7 @@
 #ifndef __SYSTEMC_EXT_TLM_UTILS_TLM_QUANTUMKEEPER_H__
 #define __SYSTEMC_EXT_TLM_UTILS_TLM_QUANTUMKEEPER_H__
 
-#include <tlm>
+#include "../core/sc_time.hh"
 
 namespace tlm_utils
 {