[gem5-dev] [S] Change in gem5/gem5[develop]: mem-dram: Make sure SHOW_SIM_OUTPUT is in global namespace.

2023-02-10 Thread Zhengrong Wang (Gerrit) via gem5-dev
Zhengrong Wang has uploaded this change for review. (  
https://gem5-review.googlesource.com/c/public/gem5/+/67859?usp=email )



Change subject: mem-dram: Make sure SHOW_SIM_OUTPUT is in global namespace.
..

mem-dram: Make sure SHOW_SIM_OUTPUT is in global namespace.

As stated in the comment, SHOW_SIM_OUTPUT is declared extern
in the DRAMSim2 print macros. Therefore, it should be defined
in the global namespace, not in gem5 namespace.

Change-Id: I05245a48ac706b46085ffa8d00db3725ce16a89e
---
M src/mem/dramsim2_wrapper.cc
1 file changed, 19 insertions(+), 6 deletions(-)



diff --git a/src/mem/dramsim2_wrapper.cc b/src/mem/dramsim2_wrapper.cc
index c622c1c..b9bcf14 100644
--- a/src/mem/dramsim2_wrapper.cc
+++ b/src/mem/dramsim2_wrapper.cc
@@ -54,12 +54,6 @@
 #include "base/compiler.hh"
 #include "base/logging.hh"

-namespace gem5
-{
-
-namespace memory
-{
-
 /**
  * DRAMSim2 requires SHOW_SIM_OUTPUT to be defined (declared extern in
  * the DRAMSim2 print macros), otherwise we get linking errors due to
@@ -67,6 +61,12 @@
  */
 int SHOW_SIM_OUTPUT = 0;

+namespace gem5
+{
+
+namespace memory
+{
+
 DRAMSim2Wrapper::DRAMSim2Wrapper(const std::string& config_file,
  const std::string& system_file,
  const std::string& working_dir,

--
To view, visit  
https://gem5-review.googlesource.com/c/public/gem5/+/67859?usp=email
To unsubscribe, or for help writing mail filters, visit  
https://gem5-review.googlesource.com/settings


Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: I05245a48ac706b46085ffa8d00db3725ce16a89e
Gerrit-Change-Number: 67859
Gerrit-PatchSet: 1
Gerrit-Owner: Zhengrong Wang 
Gerrit-MessageType: newchange
___
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org


[gem5-dev] [S] Change in gem5/gem5[develop]: dev-amdgpu: Update deprecated ports

2023-02-10 Thread Matthew Poremba (Gerrit) via gem5-dev
Matthew Poremba has uploaded this change for review. (  
https://gem5-review.googlesource.com/c/public/gem5/+/67837?usp=email )



Change subject: dev-amdgpu: Update deprecated ports
..

dev-amdgpu: Update deprecated ports

Change-Id: Icbc5636c33b437c7396ee27363eed1cf006f8882
---
M src/arch/amdgpu/common/tlb_coalescer.hh
M src/dev/amdgpu/memory_manager.hh
2 files changed, 12 insertions(+), 3 deletions(-)



diff --git a/src/arch/amdgpu/common/tlb_coalescer.hh  
b/src/arch/amdgpu/common/tlb_coalescer.hh

index 59d8ebe..56d72d7 100644
--- a/src/arch/amdgpu/common/tlb_coalescer.hh
+++ b/src/arch/amdgpu/common/tlb_coalescer.hh
@@ -152,7 +152,7 @@
   public:
 MemSidePort(const std::string &_name, TLBCoalescer *tlb_coalescer,
 PortID _index)
-: RequestPort(_name, tlb_coalescer), coalescer(tlb_coalescer),
+: RequestPort(_name), coalescer(tlb_coalescer),
   index(_index) { }

 std::deque retries;
diff --git a/src/dev/amdgpu/memory_manager.hh  
b/src/dev/amdgpu/memory_manager.hh

index e18ec64..0bd08d6 100644
--- a/src/dev/amdgpu/memory_manager.hh
+++ b/src/dev/amdgpu/memory_manager.hh
@@ -45,11 +45,11 @@

 class AMDGPUMemoryManager : public ClockedObject
 {
-class GPUMemPort : public MasterPort
+class GPUMemPort : public RequestPort
 {
   public:
 GPUMemPort(const std::string &_name, AMDGPUMemoryManager  
&_gpuMemMgr)

-: MasterPort(_name, &_gpuMemMgr), gpu_mem(_gpuMemMgr)
+: RequestPort(_name), gpu_mem(_gpuMemMgr)
 {
 }


--
To view, visit  
https://gem5-review.googlesource.com/c/public/gem5/+/67837?usp=email
To unsubscribe, or for help writing mail filters, visit  
https://gem5-review.googlesource.com/settings


Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: Icbc5636c33b437c7396ee27363eed1cf006f8882
Gerrit-Change-Number: 67837
Gerrit-PatchSet: 1
Gerrit-Owner: Matthew Poremba 
Gerrit-MessageType: newchange
___
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org


[gem5-dev] Build failed in Jenkins: compiler-checks #514

2023-02-10 Thread jenkins-no-reply--- via gem5-dev
See 


Changes:

[zhongcy93] arch-riscv: Fix the CSR instruction behavior.

[matthew.poremba] arch-vega: Implement ds_write_b8_d16_hi

[matthew.poremba] arch-vega: Make VGPR-offset for global SGPR-base signed

[seanyukigeek] ext: Fix typo in DRAMSIM2 Sconscript


--
[...truncated 1.03 KB...]
 > git checkout -f 39e813374cab3d9a04e84b4474997b7a6c71ed45 # timeout=10
Commit message: "ext: Fix typo in DRAMSIM2 Sconscript"
 > git rev-list --no-walk bd9e126d5e8c7d4e37833c57d96e078f7c1c273c # timeout=10
[Checks API] No suitable checks publisher found.
[compiler-checks] $ /bin/sh -xe /tmp/jenkins16281622523651894120.sh
+ ./tests/compiler-tests.sh -j 16
Starting build tests with 'gcc-version-12'...
'gcc-version-12' was found in the comprehensive tests. All ISAs will be built.
  * Building target 'RISCV.opt' with 'gcc-version-12'...
Done.
  * Building target 'RISCV.fast' with 'gcc-version-12'...
Done.
  * Building target 'POWER.opt' with 'gcc-version-12'...
Done.
  * Building target 'POWER.fast' with 'gcc-version-12'...
Done.
  * Building target 'NULL_MOESI_hammer.opt' with 'gcc-version-12'...
Done.
  * Building target 'NULL_MOESI_hammer.fast' with 'gcc-version-12'...
Done.
  * Building target 'X86_MI_example.opt' with 'gcc-version-12'...
Done.
  * Building target 'X86_MI_example.fast' with 'gcc-version-12'...
Done.
  * Building target 'NULL_MOESI_CMP_directory.opt' with 'gcc-version-12'...
Done.
  * Building target 'NULL_MOESI_CMP_directory.fast' with 'gcc-version-12'...
Done.
  * Building target 'ARM_MESI_Three_Level_HTM.opt' with 'gcc-version-12'...
Done.
  * Building target 'ARM_MESI_Three_Level_HTM.fast' with 'gcc-version-12'...
Done.
  * Building target 'X86_MOESI_AMD_Base.opt' with 'gcc-version-12'...
Done.
  * Building target 'X86_MOESI_AMD_Base.fast' with 'gcc-version-12'...
Done.
  * Building target 'ARM.opt' with 'gcc-version-12'...
Done.
  * Building target 'ARM.fast' with 'gcc-version-12'...
Done.
  * Building target 'ARM_MOESI_hammer.opt' with 'gcc-version-12'...
Done.
  * Building target 'ARM_MOESI_hammer.fast' with 'gcc-version-12'...
Done.
  * Building target 'NULL_MOESI_CMP_token.opt' with 'gcc-version-12'...
Done.
  * Building target 'NULL_MOESI_CMP_token.fast' with 'gcc-version-12'...
Done.
  * Building target 'SPARC.opt' with 'gcc-version-12'...
Done.
  * Building target 'SPARC.fast' with 'gcc-version-12'...
Done.
  * Building target 'NULL.opt' with 'gcc-version-12'...
Done.
  * Building target 'NULL.fast' with 'gcc-version-12'...
Done.
  * Building target 'X86.opt' with 'gcc-version-12'...
Done.
  * Building target 'X86.fast' with 'gcc-version-12'...
Done.
  * Building target 'ARM_MESI_Three_Level.opt' with 'gcc-version-12'...
Done.
  * Building target 'ARM_MESI_Three_Level.fast' with 'gcc-version-12'...
Done.
  * Building target 'NULL_MESI_Two_Level.opt' with 'gcc-version-12'...
Done.
  * Building target 'NULL_MESI_Two_Level.fast' with 'gcc-version-12'...
Done.
  * Building target 'GCN3_X86.opt' with 'gcc-version-12'...
Done.
  * Building target 'GCN3_X86.fast' with 'gcc-version-12'...
Done.
  * Building target 'Garnet_standalone.opt' with 'gcc-version-12'...
  ! Failed with exit code 125.
  * Building target 'Garnet_standalone.fast' with 'gcc-version-12'...
Done.
  * Building target 'MIPS.opt' with 'gcc-version-12'...
Done.
  * Building target 'MIPS.fast' with 'gcc-version-12'...
Done.
  * Building target 'ALL.opt' with 'gcc-version-12'...
Done.
  * Building target 'ALL.fast' with 'gcc-version-12'...
Done.
Starting build tests with 'gcc-version-11'...
  * Building target 'ARM_MOESI_hammer.opt' with 'gcc-version-11'...
Done.
  * Building target 'ARM_MOESI_hammer.fast' with 'gcc-version-11'...
Done.
Starting build tests with 'gcc-version-10'...
  * Building target 'NULL_MOESI_CMP_token.opt' with 'gcc-version-10'...
Done.
  * Building target 'NULL_MOESI_CMP_token.fast' with 'gcc-version-10'...
Done.
Starting build tests with 'gcc-version-9'...
  * Building target 'ARM_MESI_Three_Level_HTM.opt' with 'gcc-version-9'...
Done.
  * Building target 'ARM_MESI_Three_Level_HTM.fast' with 'gcc-version-9'...
Done.
Starting build tests with 'gcc-version-8'...
  * Building target 'ARM_MOESI_hammer.opt' with 'gcc-version-8'...
Done.
  * Building target 'ARM_MOESI_hammer.fast' with 'gcc-version-8'...
Done.
Starting build tests with 'gcc-version-7'...
  * Building target 'X86_MI_example.opt' with 'gcc-version-7'...
Done.
  * Building target 'X86_MI_example.fast' with 'gcc-version-7'...
Done.
Starting build tests with 'clang-version-14'...
'clang-version-14' was found in the comprehensive tests. All ISAs will be built.
  * Building target 'MIPS.opt' with 'clang-version-14'...
Done.
  * Building target 

[gem5-dev] Build failed in Jenkins: nightly #516

2023-02-10 Thread jenkins-no-reply--- via gem5-dev
See 

Changes:

[zhongcy93] arch-riscv: Fix the CSR instruction behavior.

[matthew.poremba] arch-vega: Implement ds_write_b8_d16_hi

[matthew.poremba] arch-vega: Make VGPR-offset for global SGPR-base signed

[seanyukigeek] ext: Fix typo in DRAMSIM2 Sconscript


--
[...truncated 2.14 MB...]
 [ TRACING]  -> NULL_MI_example/debug/EthernetAll.hh
 [ TRACING]  -> NULL_MI_example/debug/EthernetCksum.hh
 [ TRACING]  -> NULL_MI_example/debug/EthernetDMA.hh
 [ TRACING]  -> NULL_MI_example/debug/EthernetEEPROM.hh
 [ TRACING]  -> NULL_MI_example/debug/EthernetPIO.hh
 [ TRACING]  -> NULL_MI_example/debug/EthernetSM.hh
 [ CXX] NULL_MI_example/dev/net/etherdevice.cc -> .o
 [ CXX] NULL_MI_example/dev/net/etherswitch.cc -> .o
 [ CXX] NULL_MI_example/dev/net/etherdump.cc -> .o
 [ CXX] NULL_MI_example/dev/net/etherint.cc -> .o
 [ CXX] NULL_MI_example/dev/net/etherlink.cc -> .o
 [ CXX] NULL_MI_example/dev/net/etherpkt.cc -> .o
 [ CXX] NULL_MI_example/dev/net/ethertap.cc -> .o
 [ CXX] NULL_MI_example/dev/net/pktfifo.cc -> .o
 [ TRACING]  -> NULL_MI_example/debug/Ethernet.cc
 [ CXX] NULL_MI_example/debug/Ethernet.cc -> .o
 [ TRACING]  -> NULL_MI_example/debug/EthernetCksum.cc
 [ CXX] NULL_MI_example/debug/EthernetCksum.cc -> .o
 [ TRACING]  -> NULL_MI_example/debug/EthernetDMA.cc
 [ CXX] NULL_MI_example/debug/EthernetDMA.cc -> .o
 [ TRACING]  -> NULL_MI_example/debug/EthernetData.cc
 [ CXX] NULL_MI_example/debug/EthernetData.cc -> .o
 [ TRACING]  -> NULL_MI_example/debug/EthernetDesc.cc
 [ CXX] NULL_MI_example/debug/EthernetDesc.cc -> .o
 [ TRACING]  -> NULL_MI_example/debug/EthernetEEPROM.cc
 [ CXX] NULL_MI_example/debug/EthernetEEPROM.cc -> .o
 [ TRACING]  -> NULL_MI_example/debug/EthernetIntr.cc
 [ CXX] NULL_MI_example/debug/EthernetIntr.cc -> .o
 [ TRACING]  -> NULL_MI_example/debug/EthernetPIO.cc
 [ CXX] NULL_MI_example/debug/EthernetPIO.cc -> .o
 [ TRACING]  -> NULL_MI_example/debug/EthernetSM.cc
 [ CXX] NULL_MI_example/debug/EthernetSM.cc -> .o
 [ TRACING]  -> NULL_MI_example/debug/DistEthernet.hh
 [ TRACING]  -> NULL_MI_example/debug/DistEthernetPkt.hh
 [ TRACING]  -> NULL_MI_example/debug/DistEthernetCmd.hh
 [ TRACING]  -> NULL_MI_example/debug/DistEthernet.cc
 [ CXX] NULL_MI_example/dev/net/dist_iface.cc -> .o
 [ CXX] NULL_MI_example/dev/net/dist_etherlink.cc -> .o
 [ CXX] NULL_MI_example/dev/net/tcp_iface.cc -> .o
 [ CXX] NULL_MI_example/debug/DistEthernet.cc -> .o
 [ TRACING]  -> NULL_MI_example/debug/DistEthernetPkt.cc
 [ TRACING]  -> NULL_MI_example/debug/DistEthernetCmd.cc
 [ CXX] NULL_MI_example/debug/DistEthernetPkt.cc -> .o
 [ CXX] NULL_MI_example/debug/DistEthernetCmd.cc -> .o
 [ CXX] NULL_MI_example/dev/net/i8254xGBe.cc -> .o
 [ CXX] NULL_MI_example/dev/net/ns_gige.cc -> .o
 [ CXX] NULL_MI_example/dev/net/sinic.cc -> .o
 [ TRACING]  -> NULL_MI_example/debug/EthernetAll.cc
 [ CXX] NULL_MI_example/debug/EthernetAll.cc -> .o
 [ TRACING]  -> NULL_MI_example/debug/EthernetNoData.cc
 [ TRACING]  -> NULL_MI_example/debug/EthernetNoData.hh
 [ CXX] NULL_MI_example/dev/ps2/PS2.py.cc -> .o
 [ CXX] NULL_MI_example/debug/EthernetNoData.cc -> .o
 [SO Param] m5.objects.PS2, PS2Device -> 
NULL_MI_example/python/_m5/param_PS2Device.cc
 [SO Param] m5.objects.PS2, PS2Keyboard -> 
NULL_MI_example/python/_m5/param_PS2Keyboard.cc
 [SO Param] m5.objects.PS2, PS2Mouse -> 
NULL_MI_example/python/_m5/param_PS2Mouse.cc
 [SO Param] m5.objects.PS2, PS2Device -> NULL_MI_example/params/PS2Device.hh
 [SO Param] m5.objects.PS2, PS2TouchKit -> 
NULL_MI_example/python/_m5/param_PS2TouchKit.cc
 [SO Param] m5.objects.PS2, PS2Keyboard -> NULL_MI_example/params/PS2Keyboard.hh
 [SO Param] m5.objects.PS2, PS2Mouse -> NULL_MI_example/params/PS2Mouse.hh
 [ CXX] NULL_MI_example/python/_m5/param_PS2Device.cc -> .o
 [ TRACING]  -> NULL_MI_example/debug/PS2.hh
 [SO Param] m5.objects.PS2, PS2TouchKit -> NULL_MI_example/params/PS2TouchKit.hh
 [ CXX] NULL_MI_example/python/_m5/param_PS2Mouse.cc -> .o
 [ CXX] NULL_MI_example/python/_m5/param_PS2Keyboard.cc -> .o
 [ CXX] NULL_MI_example/dev/ps2/device.cc -> .o
 [ CXX] NULL_MI_example/dev/ps2/keyboard.cc -> .o
 [ CXX] NULL_MI_example/dev/ps2/mouse.cc -> .o
 [ CXX] NULL_MI_example/dev/ps2/types.cc -> .o
 [ CXX] NULL_MI_example/dev/ps2/touchkit.cc -> .o
 [ CXX] NULL_MI_example/python/_m5/param_PS2TouchKit.cc -> .o
 [ TRACING]  -> NULL_MI_example/debug/PS2.cc
 [ CXX] NULL_MI_example/debug/PS2.cc -> .o
 [ CXX] NULL_MI_example/dev/qemu/QemuFwCfg.py.cc -> .o
 [SO Param] m5.objects.QemuFwCfg, QemuFwCfgItem -> 
NULL_MI_example/python/_m5/param_QemuFwCfgItem.cc
 [SO Param] m5.objects.QemuFwCfg, QemuFwCfgItemBytes -> 
NULL_MI_example/python/_m5/param_QemuFwCfgItemBytes.cc
 [SO Param] m5.objects.QemuFwCfg, QemuFwCfgItemFile ->