Skip to content

Commit b59c785

Browse files
committed
Fix maglev (non-rref) test
1 parent 96c455e commit b59c785

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

sys/lib/libbenchnet/src/lib.rs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -754,6 +754,7 @@ pub fn run_fwd_maglevtest(net: &dyn Net, pkt_size: u16) -> Result<()> {
754754
let mut sum: usize = 0;
755755
let mut fwd_sum: usize = 0;
756756

757+
println!("======== Starting maglev test ==========");
757758
let start = rdtsc();
758759
let end = start + 30 * CPU_MHZ;
759760

@@ -786,12 +787,12 @@ pub fn run_fwd_maglevtest(net: &dyn Net, pkt_size: u16) -> Result<()> {
786787
}
787788
};
788789

789-
if let Some(_) = backend {
790+
//if let Some(_) = backend {
790791
unsafe {
791792
ptr::copy(our_mac.as_ptr(), pkt.as_mut_ptr().offset(6), our_mac.capacity());
792793
ptr::copy(sender_mac.as_ptr(), pkt.as_mut_ptr().offset(0), sender_mac.capacity());
793794
}
794-
}
795+
//}
795796
}
796797

797798
submit_tx += tx_packets.len();
@@ -1001,8 +1002,8 @@ pub fn run_maglev_fwd_udptest_rref(net: &dyn Net, pkt_len: usize) -> Result<()>
10011002
#[cfg(feature = "noop")]
10021003
return Ok(());
10031004

1004-
let mut sender_mac = alloc::vec![0x90, 0xe2, 0xba, 0xb5, 0x13, 0x60];
1005-
let mut our_mac = alloc::vec![0x90, 0xe2, 0xba, 0xb5, 0x15, 0x74];
1005+
let mut sender_mac = alloc::vec![ 0x90, 0xe2, 0xba, 0xb3, 0x74, 0x81];
1006+
let mut our_mac = alloc::vec![0x90, 0xe2, 0xba, 0xb5, 0x14, 0xcd];
10061007

10071008
let batch_sz = BATCH_SIZE;
10081009
let mut maglev = maglev::Maglev::new(0..3);
@@ -1072,7 +1073,7 @@ pub fn run_maglev_fwd_udptest_rref(net: &dyn Net, pkt_len: usize) -> Result<()>
10721073
for pkt in rx_collect_.iter_mut() {
10731074
let backend = {
10741075
if let Some(hash) = packettool::get_flowhash(pkt) {
1075-
Some(maglev.get_index(&hash))
1076+
Some(maglev.get_index_from_hash(hash))
10761077
} else {
10771078
None
10781079
}

0 commit comments

Comments
 (0)