Merge pull request OptimatistOpenSource#28 from Thaumy/test-arm

Add tests for `aarch64` target arch

src/perf_event/counting/group/tests/hardware.rs

@@ -24,3 +24,13 @@ fn test_ipc() {
 
     test_group(&Event::from(ev_1), &Event::from(ev_2), &mut workload);
 }
+
+#[test]
+#[cfg(target_arch = "aarch64")]
+fn test_r11_r1b() {
+    let ev_1 = unsafe { crate::RawEvent::new(0x11) };
+    let ev_2 = unsafe { crate::RawEvent::new(0x1b) };
+    let mut workload = cpu_workload;
+
+    test_group(&Event::from(ev_1), &Event::from(ev_2), &mut workload);
+}

src/perf_event/counting/group/tests/mod.rs

@@ -35,7 +35,7 @@ fn gen_group() -> CounterGroup {
 }
 
 fn gen_cfg(ev: &Event) -> Config {
-    let scopes = [EventScope::User, EventScope::Host];
+    let scopes = EventScope::all();
     Config::new(ev, &scopes)
 }
 

src/perf_event/counting/single/tests/hardware.rs

@@ -23,3 +23,21 @@ fn test_cpu_cycles() {
 
     test_single(&Event::from(ev), &mut workload);
 }
+
+#[test]
+#[cfg(target_arch = "aarch64")]
+fn test_r11() {
+    let ev = unsafe { crate::RawEvent::new(0x11) };
+    let mut workload = cpu_workload;
+
+    test_single(&Event::from(ev), &mut workload);
+}
+
+#[test]
+#[cfg(target_arch = "aarch64")]
+fn test_r1b() {
+    let ev = unsafe { crate::RawEvent::new(0x1b) };
+    let mut workload = cpu_workload;
+
+    test_single(&Event::from(ev), &mut workload);
+}

src/perf_event/counting/single/tests/mod.rs

@@ -29,7 +29,7 @@ where
 }
 
 fn gen_counter(ev: &Event) -> Counter {
-    let scopes = [EventScope::User, EventScope::Host];
+    let scopes = EventScope::all();
     let mut cfg = Config::new(ev, &scopes);
 
     Counter::new(&Process::Current, &Cpu::Any, &mut cfg).unwrap()

src/perf_event/sampling/group/tests/hardware.rs

@@ -24,3 +24,13 @@ fn test_ipc() {
 
     test_group(&Event::from(ev_1), &Event::from(ev_2), &mut workload);
 }
+
+#[test]
+#[cfg(target_arch = "aarch64")]
+fn test_r11_r1b() {
+    let ev_1 = unsafe { crate::RawEvent::new(0x11) };
+    let ev_2 = unsafe { crate::RawEvent::new(0x1b) };
+    let mut workload = cpu_workload;
+
+    test_group(&Event::from(ev_1), &Event::from(ev_2), &mut workload);
+}

src/perf_event/sampling/group/tests/mod.rs

@@ -38,7 +38,7 @@ fn gen_group() -> SamplerGroup {
 }
 
 fn gen_cfg(ev: &Event) -> Config {
-    let scopes = [EventScope::User, EventScope::Host];
+    let scopes = EventScope::all();
     let overflow_by = OverflowBy::Period(1000);
     Config::new(&ev, &scopes, &overflow_by)
 }

src/perf_event/sampling/single/tests/hardware.rs

@@ -20,5 +20,24 @@ use crate::{Event, HardwareEvent};
 fn test_cpu_cycles() {
     let ev = HardwareEvent::CpuCycles;
     let mut workload = cpu_workload;
+
+    test_single(&Event::from(ev), &mut workload);
+}
+
+#[test]
+#[cfg(target_arch = "aarch64")]
+fn test_r11() {
+    let ev = unsafe { crate::RawEvent::new(0x11) };
+    let mut workload = cpu_workload;
+
+    test_single(&Event::from(ev), &mut workload);
+}
+
+#[test]
+#[cfg(target_arch = "aarch64")]
+fn test_r1b() {
+    let ev = unsafe { crate::RawEvent::new(0x1b) };
+    let mut workload = cpu_workload;
+
     test_single(&Event::from(ev), &mut workload);
 }

src/perf_event/sampling/single/tests/mod.rs

@@ -40,7 +40,7 @@ fn gen_sampler(cfg: &Config) -> Sampler {
 }
 
 fn gen_cfg(ev: &Event) -> Config {
-    let scopes = [EventScope::User, EventScope::Host];
+    let scopes = EventScope::all();
     let overflow_by = OverflowBy::Period(1000);
     let mut extra_config = ExtraConfig::default();
     extra_config.sample_record_fields.time = true;

src/perf_event/sampling/single/tests/sample_record_fields/abi_and_regs_intr.rs

@@ -28,7 +28,7 @@ fn gen_cfg(sample_regs_intr: u64) -> Config {
     extra_config.sample_record_fields.abi_and_regs_intr = Some(sample_regs_intr);
 
     let event = HardwareEvent::CpuCycles;
-    let scopes = [EventScope::User, EventScope::Host];
+    let scopes = EventScope::all();
     let overflow_by = OverflowBy::Period(1000);
     Config::extra_new(&Event::from(event), &scopes, &overflow_by, &extra_config)
 }

src/perf_event/sampling/single/tests/sample_record_fields/abi_and_regs_user.rs

@@ -28,7 +28,7 @@ fn gen_cfg(sample_regs_user: u64) -> Config {
     extra_config.sample_record_fields.abi_and_regs_user = Some(sample_regs_user);
 
     let event = HardwareEvent::CpuCycles;
-    let scopes = [EventScope::User, EventScope::Host];
+    let scopes = EventScope::all();
     let overflow_by = OverflowBy::Period(1000);
     Config::extra_new(&Event::from(event), &scopes, &overflow_by, &extra_config)
 }

src/perf_event/sampling/single/tests/sample_record_fields/all.rs

@@ -26,7 +26,7 @@ fn gen_sampler(cfg: &Config) -> Sampler {
 
 fn gen_cfg(extra_config: ExtraConfig) -> Config {
     let event = HardwareEvent::CpuCycles;
-    let scopes = [EventScope::User, EventScope::Host];
+    let scopes = EventScope::all();
     let overflow_by = OverflowBy::Period(1000);
     Config::extra_new(&Event::from(event), &scopes, &overflow_by, &extra_config)
 }

src/perf_event/sampling/single/tests/sample_record_fields/data_stack_user.rs

@@ -28,7 +28,7 @@ fn gen_cfg(sample_stack_user: u16) -> Config {
     extra_config.sample_record_fields.data_stack_user = Some(sample_stack_user);
 
     let event = HardwareEvent::CpuCycles;
-    let scopes = [EventScope::User, EventScope::Host];
+    let scopes = EventScope::all();
     let overflow_by = OverflowBy::Period(1000);
     Config::extra_new(&Event::from(event), &scopes, &overflow_by, &extra_config)
 }

src/perf_event/sampling/single/tests/sample_record_fields/ips.rs

@@ -28,7 +28,7 @@ fn gen_cfg(sample_max_stack: u16) -> Config {
     extra_config.sample_record_fields.ips = Some(sample_max_stack);
 
     let event = HardwareEvent::CpuCycles;
-    let scopes = [EventScope::User, EventScope::Host];
+    let scopes = EventScope::all();
     let overflow_by = OverflowBy::Period(1000);
     Config::extra_new(&Event::from(event), &scopes, &overflow_by, &extra_config)
 }

src/perf_event/sampling/single/tests/sample_record_fields/mod.rs

@@ -33,7 +33,7 @@ fn gen_sampler(cfg: &Config) -> Sampler {
 
 fn gen_cfg(extra_config: ExtraConfig) -> Config {
     let event = HardwareEvent::CpuCycles;
-    let scopes = [EventScope::User, EventScope::Host];
+    let scopes = EventScope::all();
     let overflow_by = OverflowBy::Period(1000);
     Config::extra_new(&Event::from(event), &scopes, &overflow_by, &extra_config)
 }

src/perf_event/sampling/single/tests/sample_record_fields/weight.rs

@@ -29,7 +29,7 @@ fn gen_cfg(repr: WeightRepr) -> Config {
     extra_config.sample_record_fields.weight = Some(repr);
 
     let event = HardwareEvent::CpuCycles;
-    let scopes = [EventScope::User, EventScope::Host];
+    let scopes = EventScope::all();
     let overflow_by = OverflowBy::Period(1000);
     Config::extra_new(&Event::from(event), &scopes, &overflow_by, &extra_config)
 }