From b9df038ca8fc6b30a7b5a6652f8e84b630be81d4 Mon Sep 17 00:00:00 2001 From: "Bobby R. Bruce" Date: Mon, 21 Jun 2021 12:19:50 -0700 Subject: [PATCH 1/2] systemc,tests,python: Updated testall.py to python3 Change-Id: I95fce9d71bf0af9cd76e8bf0dd353281cff8ed74 Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/47022 Maintainer: Bobby R. Bruce Maintainer: Jason Lowe-Power Reviewed-by: Jason Lowe-Power Tested-by: kokoro (cherry picked from commit f9a941524febbea0143dd736ee8924f385ecf6f3) Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/47919 Reviewed-by: Bobby R. Bruce --- src/systemc/tests/tlm/endian_conv/testall.py | 32 ++++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/systemc/tests/tlm/endian_conv/testall.py b/src/systemc/tests/tlm/endian_conv/testall.py index a534fa7f43..f3a9d0b9a5 100644 --- a/src/systemc/tests/tlm/endian_conv/testall.py +++ b/src/systemc/tests/tlm/endian_conv/testall.py @@ -106,7 +106,7 @@ def txn_generator(nr): if random.random() < 0.25: break length = random.choice(lengths) addr_base = random.choice(list(range(0,1024,bus_width))) - addr_offset = random.choice(list(range(bus_width))+[0]*(bus_width/2)) + addr_offset = random.choice(list(range(bus_width))+[0]*int(bus_width//2)) txn = transaction( bus_width = bus_width, data_width = data_width, @@ -137,15 +137,15 @@ def txn_generator(nr): # test code for transaction generator if False: for t in txn_generator(20): - print t + print(t) raise Exception # end test code class memory_state_cl: buffer_size = 2048 - repeats = 10 * buffer_size / 36 - population = (string.lowercase + string.digits) * repeats + repeats = 10 * buffer_size // 36 + population = (string.ascii_lowercase + string.digits) * int(repeats) def __init__(self): self.initiator = "".join( random.sample(memory_state_cl.population, memory_state_cl.buffer_size)) @@ -293,10 +293,10 @@ fragmenters = [globals()[n] for n in globals().keys() if n[:8]=="__FRAG__"] # test code for fragmenters if False: for t in txn_generator(1): - print t - print + print(t) + print() for u in fragmenters[4](t): - print u + print(u) raise Exception # end test code @@ -401,16 +401,16 @@ actual memory: from sys import argv -print "Testing Endianness Conversion Functions" -print "March 2008" -print "OSCI TLM-2" +print("Testing Endianness Conversion Functions") +print("March 2008") +print("OSCI TLM-2") try: nr_txns_to_test = int(argv[1]) except: - print "No command line input for number of tests, using default" + print("No command line input for number of tests, using default") nr_txns_to_test = 1000 -print "Number to test:", nr_txns_to_test +print("Number to test:", nr_txns_to_test) # generate and test a number of transactions for txn in txn_generator(nr_txns_to_test): @@ -445,12 +445,12 @@ golden memory: actual memory: %s""" % (fragmenter, txn, initial_memory, golden_memory_state, memory_state)) - print ".", -print + print("."), +print() -print "Conversion functions usage frequency:" +print("Conversion functions usage frequency:") for c in all_converters: - print c.nr, c.__name__, c.usage + print(c.nr, c.__name__, c.usage) From b2677990f60ca84f263fe82c9d2124bc4a277ff2 Mon Sep 17 00:00:00 2001 From: "Bobby R. Bruce" Date: Mon, 12 Jul 2021 10:35:32 -0700 Subject: [PATCH 2/2] gpu-compute: Add missing overrides These missing overrides were causing compilations errors with the Clang 11 compiler: https://www.mail-archive.com/gem5-dev@gem5.org/msg39683.html Change-Id: Ib5e7096ab9a7a8505bcc848ff3f08674f7f289ce Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/47899 Reviewed-by: Bobby R. Bruce Reviewed-by: Matt Sinclair Maintainer: Bobby R. Bruce Maintainer: Matt Sinclair Tested-by: kokoro --- src/dev/hsa/hsa_packet_processor.hh | 6 +++--- src/gpu-compute/gpu_command_processor.hh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/dev/hsa/hsa_packet_processor.hh b/src/dev/hsa/hsa_packet_processor.hh index 5c75eb7225..9545006cb5 100644 --- a/src/dev/hsa/hsa_packet_processor.hh +++ b/src/dev/hsa/hsa_packet_processor.hh @@ -332,9 +332,9 @@ class HSAPacketProcessor: public DmaVirtDevice void getCommandsFromHost(int pid, uint32_t rl_idx); // PIO interface - virtual Tick read(Packet*); - virtual Tick write(Packet*); - virtual AddrRangeList getAddrRanges() const; + virtual Tick read(Packet*) override; + virtual Tick write(Packet*) override; + virtual AddrRangeList getAddrRanges() const override; void finishPkt(void *pkt, uint32_t rl_idx); void finishPkt(void *pkt) { finishPkt(pkt, 0); } void schedAQLProcessing(uint32_t rl_idx); diff --git a/src/gpu-compute/gpu_command_processor.hh b/src/gpu-compute/gpu_command_processor.hh index 193d861b0c..1c36c2b1d9 100644 --- a/src/gpu-compute/gpu_command_processor.hh +++ b/src/gpu-compute/gpu_command_processor.hh @@ -135,7 +135,7 @@ class GPUCommandProcessor : public DmaVirtDevice typedef void (DmaDevice::*DmaFnPtr)(Addr, int, Event*, uint8_t*, Tick); void initABI(HSAQueueEntry *task); HSAPacketProcessor *hsaPP; - void translateOrDie(Addr vaddr, Addr &paddr); + void translateOrDie(Addr vaddr, Addr &paddr) override; /** * Perform a DMA read of the read_dispatch_id_field_base_byte_offset