From dce0cba9948f79e6202894c84c20900eb191af0e Mon Sep 17 00:00:00 2001 From: Andreas Sandberg Date: Thu, 26 Apr 2018 18:11:43 +0100 Subject: [PATCH] cpu: Remove reduntant protobuf includes Change-Id: Ic34b94b3a2ea951bc023cfce2d09ce304a602e41 Signed-off-by: Andreas Sandberg Reviewed-by: Nikos Nikoleris Reviewed-on: https://gem5-review.googlesource.com/11512 Reviewed-by: Jason Lowe-Power --- src/cpu/testers/traffic_gen/base_gen.cc | 1 - src/cpu/testers/traffic_gen/base_gen.hh | 1 - src/cpu/testers/traffic_gen/dram_gen.cc | 1 - src/cpu/testers/traffic_gen/dram_gen.hh | 1 - src/cpu/testers/traffic_gen/dram_rot_gen.cc | 1 - src/cpu/testers/traffic_gen/dram_rot_gen.hh | 1 - src/cpu/testers/traffic_gen/idle_gen.cc | 1 - src/cpu/testers/traffic_gen/idle_gen.hh | 1 - src/cpu/testers/traffic_gen/linear_gen.cc | 1 - src/cpu/testers/traffic_gen/linear_gen.hh | 1 - src/cpu/testers/traffic_gen/random_gen.cc | 1 - src/cpu/testers/traffic_gen/random_gen.hh | 1 - 12 files changed, 12 deletions(-) diff --git a/src/cpu/testers/traffic_gen/base_gen.cc b/src/cpu/testers/traffic_gen/base_gen.cc index f25bfb08a5..7963574e1b 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 26aa62df4b..5f1c2afd90 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 bfa0ea9489..8bbf9b88e3 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 d18a14b1c0..b4314086af 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 8d29487236..103ff4d866 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 e655376446..2b5d9607af 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 9c2ce7fef8..68e00c9682 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 d503abeb6c..0e4394018a 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 412c6a3fb5..773c2d7e50 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 18a1eb5793..8af9e833bb 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 bc241757df..73c2f45c44 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 598abf7f17..ec60b35bc0 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