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 f25bfb08a59abf503d2186a585b9f23ddb959444..7963574e1b1d562bed8ab3a07f985e70f405ac19 100644 (file)
--- 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 26aa62df4b68c2ff31f520334ccc91a0e88bf4da..5f1c2afd9007af240fc03723d3bd4b4a47354f6d 100644 (file)
--- 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 bfa0ea9489bd20bff9b3ec5ff346f531f8925cb9..8bbf9b88e3d17801029a79368d55b01567a68683 100644 (file)
--- 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 d18a14b1c06159b464751dbc13dfccf00cbe30b3..b4314086af87a0a31e7e28eadd9840f2a3e85191 100644 (file)
--- 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 8d29487236f7b1c00f2c88b43cf5b14f719e8447..103ff4d866911ff5e0c72a42b8b89bb7591fcd8c 100644 (file)
--- 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 e6553764462b581dd32e8589b7e5777aa1b24281..2b5d9607afd6604daf7ff8ffdd72102dc102bfbe 100644 (file)
--- 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 9c2ce7fef838a724bdb635e3c540efbbc2d3eb22..68e00c9682298c30ee496ed6f085aac271f943c4 100644 (file)
--- 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 d503abeb6cf17759290ef39f35d63e61f06fc542..0e4394018ac01a8ae0ccdeb7d277445d5c361c7b 100644 (file)
--- 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 412c6a3fb52175f9e940ca1d1ffbfe825652d929..773c2d7e501e363094d0fc778fc6915f898751d9 100644 (file)
--- 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 18a1eb5793689aec5d722c2e45bd0faab9f7fc56..8af9e833bb27b13f41cb0ef2b60ae46253033713 100644 (file)
--- 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 bc241757df177bab640a28e0193ac90084c13dc2..73c2f45c44018298ac42f577f90db9032375b784 100644 (file)
--- 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 598abf7f17e11db3da2e50ec01c8ad852f43eefc..ec60b35bc0530db0f2d209bdc812f58dd421d627 100644 (file)
--- 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