misc: fix pre-commit warnings

Change-Id: Iaab990ad265f327d0df397b1bd7bd2f3e40f4a79

.gitignore

@@ -37,4 +37,4 @@ ext/custom/model_counter/libVerilatorCounter.so
 ext/custom/libVerilatorCounter.so
 ext/custom/custom_packet_counter.hh
 ext/custom/wrapper_counter.hh
-trace.vcd
+trace.vcd

README_Zh.md

@@ -54,17 +54,17 @@ else if (decoded_inst->isFloating())
 >
 > ### commit
 >
-> 
+>
 >
 > pop LSQ阶段：
 >
 > ~~~c++
 >   if (completed_inst && (inst->isMemRef() || inst->isFloating() ))
 > ~~~
 >
-> 
 >
-> 
+>
+>
 
 ### 添加函数
 
@@ -101,7 +101,7 @@ MinorCPU
         cpu_, *this,
 
         ),
-    
+
 ~~~
 
 execute的include
@@ -160,7 +160,7 @@ execute的include
 >
 > ~~~c++
 > custominst_port = RequestPort("CustomInst Port")
-> 
+>
 >       _cached_ports = ["icache_port", "dcache_port", "custominst_port"]
 > ~~~
 >
@@ -169,9 +169,9 @@ execute的include
 > ~~~c++
 > else if (if_name == "custominst_port")
 >   return getCustPort();
-> 
-> 
-> 
+>
+>
+>
 > getCustPort().takeOverFrom(&oldCPU->getCustPort());
 > ~~~
 >
@@ -180,15 +180,15 @@ execute的include
 > ~~~c++
 > /** Custom*/
 > virtual Port &getCustPort() = 0;
-> 
-> 
-> 
-> 
+>
+>
+>
+>
 > ~~~
 >
-> 
 >
-> 
+>
+>
 
 
 
@@ -347,21 +347,21 @@ scons build/RISCV/gem5.opt
 ## 运行gem5
 
 ~~~c++
-build/RISCV/gem5.opt configs/custom/riscv-floating.py 
+build/RISCV/gem5.opt configs/custom/riscv-floating.py
 ~~~
 
 打开debug
 
 ~~~bash
-build/RISCV/gem5.opt --debug-flags=CustomObj configs/custom/riscv-floating.py 
+build/RISCV/gem5.opt --debug-flags=CustomObj configs/custom/riscv-floating.py
 ~~~
 
 
 
 运行counter
 
 ~~~bash
-build/RISCV/gem5.opt --debug-flags=CustomObj configs/custom/riscv-floating-counter.py 
+build/RISCV/gem5.opt --debug-flags=CustomObj configs/custom/riscv-floating-counter.py
 ~~~
 
 
@@ -387,7 +387,7 @@ ext/custom/SConscript里面库路径还用的绝对路径，还待解决
 报错
 
 ~~~bash
-root@CsxDesktop:/home/csx/workland/mycode/gem5-custom# build/RISCV/gem5.opt --debug-flags=CustomObj configs/custom/riscv-floating-counter.py 
+root@CsxDesktop:/home/csx/workland/mycode/gem5-custom# build/RISCV/gem5.opt --debug-flags=CustomObj configs/custom/riscv-floating-counter.py
 build/RISCV/gem5.opt: error while loading shared libraries: libVerilatorCounter.so: cannot open shared object file: No such file or directory
 ~~~
 
@@ -396,16 +396,3 @@ build/RISCV/gem5.opt: error while loading shared libraries: libVerilatorCounter.
 ~~~bash
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/home/csx/workland/mycode/gem5_custom/ext/custom
 ~~~
-
-
-
-
-
-
-
-
-
-
-
-
-

configs/custom/riscv-floating-counter.py

@@ -58,7 +58,7 @@
 
 system.system_port = system.membus.cpu_side_ports
 
-#system.custom.custominst_port = system.membus.cpu_side_ports
+# system.custom.custominst_port = system.membus.cpu_side_ports
 
 system.cpu.custominst_port = system.counter.counter_port
 
@@ -75,7 +75,7 @@
     thispath,
     "../../",
     "custom_test/float"
-    #"tests/test-progs/hello/bin/riscv/linux/hello",
+    # "tests/test-progs/hello/bin/riscv/linux/hello",
 )
 
 system.workload = SEWorkload.init_compatible(binary)

configs/custom/riscv-floating.py

@@ -58,7 +58,7 @@
 
 system.system_port = system.membus.cpu_side_ports
 
-#system.custom.custominst_port = system.membus.cpu_side_ports
+# system.custom.custominst_port = system.membus.cpu_side_ports
 
 system.cpu.custominst_port = system.custom.custominst_port
 
@@ -75,7 +75,7 @@
     thispath,
     "../../",
     "custom_test/float"
-    #"tests/test-progs/hello/bin/riscv/linux/hello",
+    # "tests/test-progs/hello/bin/riscv/linux/hello",
 )
 
 system.workload = SEWorkload.init_compatible(binary)

src/cpu/minor/SConscript

@@ -45,7 +45,7 @@ if not env['CONF']['USE_NULL_ISA']:
         'MinorOpClass', 'MinorOpClassSet', 'MinorFUTiming', 'MinorFU',
         'MinorFUPool', 'BaseMinorCPU'],
         enums=['ThreadPolicy'])
-    
+
 
 
     Source('activity.cc')
@@ -61,10 +61,10 @@ if not env['CONF']['USE_NULL_ISA']:
     Source('pipeline.cc')
     Source('scoreboard.cc')
     Source('stats.cc')
-    
+
     Source('custom.cc')
 
-    
+
 
     DebugFlag('MinorCPU', 'Minor CPU-level events')
     DebugFlag('MinorExecute', 'Minor Execute stage')
@@ -74,7 +74,7 @@ if not env['CONF']['USE_NULL_ISA']:
     DebugFlag('MinorTrace', 'MinorTrace cycle-by-cycle state trace')
     DebugFlag('MinorTiming', 'Extra timing for instructions')
 
-    
+
 
     CompoundFlag('Minor', [
         'MinorCPU', 'MinorExecute', 'MinorInterrupt', 'MinorMem',

src/cpu/minor/custom.cc

@@ -45,7 +45,7 @@ Custom::SendToRTL(MinorDynInstPtr inst)
     Custom::tryToSend(packet);
 }
 
-bool 
+bool
 Custom::tryToSend(PacketPtr pkt)
 {
     DPRINTF(CustomObj, "customInstPort sendTimingReq:%d\n", curTick());
@@ -55,15 +55,15 @@ Custom::tryToSend(PacketPtr pkt)
     return false;
 }
 
-void 
+void
 Custom::recvReqRetry()
 {
     DPRINTF(CustomObj, "customInstPort recvReqRetry:%d\n", curTick());
     tryToSend(packet);
 }
 
 
-Port & 
+Port &
 Custom::getPort(const std::string &if_name, PortID idx)
 {
     if (if_name == "custominst_port")
@@ -75,5 +75,3 @@ Custom::getPort(const std::string &if_name, PortID idx)
 } //End namespace minor
 
 } //End namespace gem5
-
-

src/cpu/minor/custom.hh

@@ -14,7 +14,7 @@
 
 namespace gem5
 {
- 
+
 namespace minor
 {
 
@@ -36,7 +36,7 @@ class Custom : public Named
                 CustomInstPort(std::string name, Custom &custom_, MinorCPU &cpu) :
                     MinorCPU::MinorCPUPort(name, cpu), custom(custom_)
                 { }
-            
+
             protected:
                 bool recvTimingResp(PacketPtr ptk) override { panic("dont imp recvTimingResp"); }
 
@@ -73,7 +73,7 @@ class Custom : public Named
         void SendToRTL(MinorDynInstPtr inst);
 
         Port & getPort(const std::string &if_name, PortID idx=InvalidPortID);
-        
+
 
 
 
@@ -90,4 +90,4 @@ class Custom : public Named
 
 
 
-#endif 
+#endif

src/cpu/minor/execute.cc

@@ -1914,7 +1914,7 @@ Execute::getCustPort()
 }
 
 /*  */
-void 
+void
 Execute::SendToCustom(MinorDynInstPtr inst)
 {
     DPRINTF(CustomObj, "SendToCustom[%d]\n", curTick());

src/custom/CustomCounter.py

@@ -1,12 +1,12 @@
-
 from m5.params import *
 from m5.proxy import *
 from m5.SimObject import SimObject
 from m5.objects.CustomObj import CustomObj
 
+
 class CustomCounter(CustomObj):
-    type = 'CustomCounter'
+    type = "CustomCounter"
     cxx_header = "custom/custom_counter.hh"
     cxx_class = "gem5::CustomCounter"
 
-    counter_port = ResponsePort("CPU side port, receives custom inst")
+    counter_port = ResponsePort("CPU side port, receives custom inst")

src/custom/CustomObj.py

@@ -2,9 +2,10 @@
 from m5.proxy import *
 from m5.SimObject import SimObject
 
+
 class CustomObj(SimObject):
-    type = 'CustomObj'
+    type = "CustomObj"
     cxx_header = "custom/custom_obj.hh"
     cxx_class = "gem5::CustomObj"
 
-    custominst_port = ResponsePort("CPU side port, receives custom inst")
+    custominst_port = ResponsePort("CPU side port, receives custom inst")

src/custom/SConscript

@@ -8,4 +8,3 @@ Source('custom_obj.cc')
 Source('custom_counter.cc')
 
 DebugFlag('CustomObj', "Custom Inst")
-

src/custom/custom_counter.cc

@@ -38,7 +38,7 @@ CustomCounter::CPUSidePort::getAddrRanges() const
     return owner->getAddrRanges();
 }
 
-void 
+void
 CustomCounter::CPUSidePort::recvFunctional(PacketPtr pkt)
 {
     return owner->recvFunctional(pkt);
@@ -55,7 +55,7 @@ CustomCounter::CPUSidePort::recvTimingReq(PacketPtr pkt)
     }
 }
 
-void 
+void
 CustomCounter::CPUSidePort::sendPacket(PacketPtr pkt)
 {
     panic_if(blockedPacket != nullptr, "Should never try to send if blocked!\n");
@@ -86,16 +86,16 @@ CustomCounter::CPUSidePort::trySendRetry()
 }
 
 
-AddrRangeList 
+AddrRangeList
 CustomCounter::getAddrRanges() const
 {
-    
+
 }
 
-void 
+void
 CustomCounter::recvFunctional(PacketPtr pkt)
 {
-    
+
 }
 
 //---------------------------//
@@ -125,7 +125,7 @@ CustomCounter::handleInst()
     assert(blocked);
     DPRINTF(CustomObj, "handle float inst at %d \n", curTick());
     reset();
-    
+
     input.ena = 1;
     input.rst = 0;
     tick();
@@ -145,7 +145,7 @@ void
 CustomCounter::tick()
 {
     DPRINTF(CustomObj, "tick at %d \n", curTick());
-    
+
     outputCounter out = wr->tick(input);
 
     DPRINTF(CustomObj, "out.cnt = %d \n", out.cnt);
@@ -174,7 +174,7 @@ CustomCounter::reset()
     wr->reset();
 }
 
-void 
+void
 CustomCounter::initRTLModel()
 {
     //traceOn = true
@@ -184,7 +184,7 @@ CustomCounter::initRTLModel()
     //DPRINTF(CustomObj, "out.cnt = %d \n", curTick());
 }
 
-void 
+void
 CustomCounter::endRTLModel()
 {
     DPRINTF(CustomObj, "endRTLModel at %d \n", curTick());
@@ -195,4 +195,4 @@ CustomCounter::endRTLModel()
 
 
 
-}
+}