cpu: Remove reduntant protobuf includes
Change-Id: Ic34b94b3a2ea951bc023cfce2d09ce304a602e41
Signed-off-by: Andreas Sandberg <andreas.sandberg@arm.com>
Reviewed-by: Nikos Nikoleris <nikos.nikoleris@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/11512
Reviewed-by: Jason Lowe-Power <jason@lowepower.com>
diff --git a/src/cpu/testers/traffic_gen/base_gen.cc b/src/cpu/testers/traffic_gen/base_gen.cc
index f25bfb0..7963574 100644
--- a/src/cpu/testers/traffic_gen/base_gen.cc
+++ b/src/cpu/testers/traffic_gen/base_gen.cc
@@ -47,7 +47,6 @@
#include "base/random.hh"
#include "base/trace.hh"
#include "debug/TrafficGen.hh"
-#include "proto/packet.pb.h"
BaseGen::BaseGen(const std::string& _name, MasterID master_id, Tick _duration)
: _name(_name), masterID(master_id), duration(_duration)
diff --git a/src/cpu/testers/traffic_gen/base_gen.hh b/src/cpu/testers/traffic_gen/base_gen.hh
index 26aa62d..5f1c2af 100644
--- a/src/cpu/testers/traffic_gen/base_gen.hh
+++ b/src/cpu/testers/traffic_gen/base_gen.hh
@@ -51,7 +51,6 @@
#include "base/bitfield.hh"
#include "base/intmath.hh"
#include "mem/packet.hh"
-#include "proto/protoio.hh"
/**
* Base class for all generators, with the shared functionality and
diff --git a/src/cpu/testers/traffic_gen/dram_gen.cc b/src/cpu/testers/traffic_gen/dram_gen.cc
index bfa0ea9..8bbf9b8 100644
--- a/src/cpu/testers/traffic_gen/dram_gen.cc
+++ b/src/cpu/testers/traffic_gen/dram_gen.cc
@@ -47,7 +47,6 @@
#include "base/random.hh"
#include "base/trace.hh"
#include "debug/TrafficGen.hh"
-#include "proto/packet.pb.h"
PacketPtr
DramGen::getNextPacket()
diff --git a/src/cpu/testers/traffic_gen/dram_gen.hh b/src/cpu/testers/traffic_gen/dram_gen.hh
index d18a14b..b431408 100644
--- a/src/cpu/testers/traffic_gen/dram_gen.hh
+++ b/src/cpu/testers/traffic_gen/dram_gen.hh
@@ -52,7 +52,6 @@
#include "base/bitfield.hh"
#include "base/intmath.hh"
#include "mem/packet.hh"
-#include "proto/protoio.hh"
#include "random_gen.hh"
/**
diff --git a/src/cpu/testers/traffic_gen/dram_rot_gen.cc b/src/cpu/testers/traffic_gen/dram_rot_gen.cc
index 8d29487..103ff4d 100644
--- a/src/cpu/testers/traffic_gen/dram_rot_gen.cc
+++ b/src/cpu/testers/traffic_gen/dram_rot_gen.cc
@@ -47,7 +47,6 @@
#include "base/random.hh"
#include "base/trace.hh"
#include "debug/TrafficGen.hh"
-#include "proto/packet.pb.h"
PacketPtr
DramRotGen::getNextPacket()
diff --git a/src/cpu/testers/traffic_gen/dram_rot_gen.hh b/src/cpu/testers/traffic_gen/dram_rot_gen.hh
index e655376..2b5d960 100644
--- a/src/cpu/testers/traffic_gen/dram_rot_gen.hh
+++ b/src/cpu/testers/traffic_gen/dram_rot_gen.hh
@@ -53,7 +53,6 @@
#include "base/intmath.hh"
#include "dram_gen.hh"
#include "mem/packet.hh"
-#include "proto/protoio.hh"
class DramRotGen : public DramGen
{
diff --git a/src/cpu/testers/traffic_gen/idle_gen.cc b/src/cpu/testers/traffic_gen/idle_gen.cc
index 9c2ce7f..68e00c9 100644
--- a/src/cpu/testers/traffic_gen/idle_gen.cc
+++ b/src/cpu/testers/traffic_gen/idle_gen.cc
@@ -47,7 +47,6 @@
#include "base/random.hh"
#include "base/trace.hh"
#include "debug/TrafficGen.hh"
-#include "proto/packet.pb.h"
void
IdleGen::enter() { }
diff --git a/src/cpu/testers/traffic_gen/idle_gen.hh b/src/cpu/testers/traffic_gen/idle_gen.hh
index d503abe..0e43940 100644
--- a/src/cpu/testers/traffic_gen/idle_gen.hh
+++ b/src/cpu/testers/traffic_gen/idle_gen.hh
@@ -52,7 +52,6 @@
#include "base/intmath.hh"
#include "base_gen.hh"
#include "mem/packet.hh"
-#include "proto/protoio.hh"
/**
* The idle generator does nothing.
diff --git a/src/cpu/testers/traffic_gen/linear_gen.cc b/src/cpu/testers/traffic_gen/linear_gen.cc
index 412c6a3..773c2d7 100644
--- a/src/cpu/testers/traffic_gen/linear_gen.cc
+++ b/src/cpu/testers/traffic_gen/linear_gen.cc
@@ -47,7 +47,6 @@
#include "base/random.hh"
#include "base/trace.hh"
#include "debug/TrafficGen.hh"
-#include "proto/packet.pb.h"
void
LinearGen::enter()
diff --git a/src/cpu/testers/traffic_gen/linear_gen.hh b/src/cpu/testers/traffic_gen/linear_gen.hh
index 18a1eb5..8af9e83 100644
--- a/src/cpu/testers/traffic_gen/linear_gen.hh
+++ b/src/cpu/testers/traffic_gen/linear_gen.hh
@@ -53,7 +53,6 @@
#include "base/intmath.hh"
#include "base_gen.hh"
#include "mem/packet.hh"
-#include "proto/protoio.hh"
/**
* The linear generator generates sequential requests from a
diff --git a/src/cpu/testers/traffic_gen/random_gen.cc b/src/cpu/testers/traffic_gen/random_gen.cc
index bc24175..73c2f45 100644
--- a/src/cpu/testers/traffic_gen/random_gen.cc
+++ b/src/cpu/testers/traffic_gen/random_gen.cc
@@ -47,7 +47,6 @@
#include "base/random.hh"
#include "base/trace.hh"
#include "debug/TrafficGen.hh"
-#include "proto/packet.pb.h"
void
RandomGen::enter()
diff --git a/src/cpu/testers/traffic_gen/random_gen.hh b/src/cpu/testers/traffic_gen/random_gen.hh
index 598abf7..ec60b35 100644
--- a/src/cpu/testers/traffic_gen/random_gen.hh
+++ b/src/cpu/testers/traffic_gen/random_gen.hh
@@ -53,7 +53,6 @@
#include "base/intmath.hh"
#include "base_gen.hh"
#include "mem/packet.hh"
-#include "proto/protoio.hh"
/**
* The random generator is similar to the linear one, but does
