Wrap AES acceleration tests in testsets

Author: pthariensflame

test/aarch64/aesni.jl

@@ -1,26 +1,28 @@
 import Random: seed!
-using Test: @test
+using Test: @test, @testset
 
 using RandomNumbers
 using Random123
 
 import RandomNumbers: split_uint
 import Random123: uint64x2, AESNIKey
 
-x = zero(uint64x2)
-ctr = uint64x2(0x9799b5d54f7b9227, 0xb47607190d0dfefb)
-key = 0x07b8e4b6aa98ec245a7da274d3b8146a
-aesni_key = AESNIKey(key)
-@test rand(AESNI1x(x, ctr, aesni_key), UInt128) ≡ 0x60f4c27fe48fe1b8c5f4568a585b0dc0
+@testset "Accelerated AESNI" begin
+    x = zero(uint64x2)
+    ctr = uint64x2(0x9799b5d54f7b9227, 0xb47607190d0dfefb)
+    key = 0x07b8e4b6aa98ec245a7da274d3b8146a
+    aesni_key = AESNIKey(key)
+    @test rand(AESNI1x(x, ctr, aesni_key), UInt128) ≡ 0x60f4c27fe48fe1b8c5f4568a585b0dc0
 
-r = AESNI1x(key)
-r1 = AESNI4x(split_uint(key, UInt32))
-@test seed_type(r) ≡ UInt128
-@test seed_type(r1) ≡ NTuple{4, UInt32}
-@test copyto!(copy(r), r) == r
-@test copyto!(copy(r1), r1) == r1
-@test UInt128(r.x) ≡ rand(r1, UInt128)
-@test rand(r, UInt128) ≡ rand(r1, UInt128)
-set_counter!(r, 0)
-set_counter!(r1, 1)
-@test rand(r, Tuple{UInt128})[1] ≡ rand(r1, UInt128)
+    r = AESNI1x(key)
+    r1 = AESNI4x(split_uint(key, UInt32))
+    @test seed_type(r) ≡ UInt128
+    @test seed_type(r1) ≡ NTuple{4, UInt32}
+    @test copyto!(copy(r), r) == r
+    @test copyto!(copy(r1), r1) == r1
+    @test UInt128(r.x) ≡ rand(r1, UInt128)
+    @test rand(r, UInt128) ≡ rand(r1, UInt128)
+    set_counter!(r, 0)
+    set_counter!(r1, 1)
+    @test rand(r, Tuple{UInt128})[1] ≡ rand(r1, UInt128)
+end

test/aarch64/ars.jl

@@ -1,29 +1,31 @@
 import Random: seed!
-using Test: @test
+using Test: @test, @testset
 
 using RandomNumbers
 using Random123
 
 import RandomNumbers: split_uint
 import Random123: uint64x2
 
-x = zero(uint64x2)
-ctr = uint64x2(0x9799b5d54f7b9227, 0xb47607190d0dfefb)
-key = uint64x2(0x07b8e4b6aa98ec24, 0x5a7da274d3b8146a)
-@test rand(ARS1x{1}(x, ctr, key), UInt128) ≡ 0x1a0b14c707b64224e548ef12331396ef
-@test rand(ARS1x{2}(x, ctr, key), UInt128) ≡ 0x3ced8e0970690f718336318ba22e8ae1
-@test rand(ARS1x{3}(x, ctr, key), UInt128) ≡ UInt128(uint64x2(0xb6621a8b006319e8, 0x67c841642c32fc19))
-@test rand(ARS1x{10}(x, ctr, key), UInt128) ≡ UInt128(uint64x2(0xac35df44f996ed82, 0x4e287697bad2f9a2))
+@testset "Accelerated ARS" begin
+    x = zero(uint64x2)
+    ctr = uint64x2(0x9799b5d54f7b9227, 0xb47607190d0dfefb)
+    key = uint64x2(0x07b8e4b6aa98ec24, 0x5a7da274d3b8146a)
+    @test rand(ARS1x{1}(x, ctr, key), UInt128) ≡ 0x1a0b14c707b64224e548ef12331396ef
+    @test rand(ARS1x{2}(x, ctr, key), UInt128) ≡ 0x3ced8e0970690f718336318ba22e8ae1
+    @test rand(ARS1x{3}(x, ctr, key), UInt128) ≡ UInt128(uint64x2(0xb6621a8b006319e8, 0x67c841642c32fc19))
+    @test rand(ARS1x{10}(x, ctr, key), UInt128) ≡ UInt128(uint64x2(0xac35df44f996ed82, 0x4e287697bad2f9a2))
 
-key = rand(UInt128)
-r = ARS1x(key)
-r1 = ARS4x(split_uint(key, UInt32))
-@test seed_type(r) ≡ UInt128
-@test seed_type(r1) ≡ NTuple{4, UInt32}
-@test copyto!(copy(r), r) == r
-@test copyto!(copy(r1), r1) == r1
-@test UInt128(r.x) ≡ rand(r1, UInt128)
-@test rand(r, UInt128) ≡ rand(r1, UInt128)
-set_counter!(r, 0)
-set_counter!(r1, 1)
-@test rand(r, Tuple{UInt128})[1] ≡ rand(r1, UInt128)
+    key = rand(UInt128)
+    r = ARS1x(key)
+    r1 = ARS4x(split_uint(key, UInt32))
+    @test seed_type(r) ≡ UInt128
+    @test seed_type(r1) ≡ NTuple{4, UInt32}
+    @test copyto!(copy(r), r) == r
+    @test copyto!(copy(r1), r1) == r1
+    @test UInt128(r.x) ≡ rand(r1, UInt128)
+    @test rand(r, UInt128) ≡ rand(r1, UInt128)
+    set_counter!(r, 0)
+    set_counter!(r1, 1)
+    @test rand(r, Tuple{UInt128})[1] ≡ rand(r1, UInt128)
+end

test/x86/aesni.jl

@@ -1,26 +1,28 @@
 import Random: seed!
-using Test: @test
+using Test: @test, @testset
 
 using RandomNumbers
 using Random123
 
 import RandomNumbers: split_uint
 import Random123: __m128i, AESNIKey
 
-x = zero(__m128i)
-ctr = __m128i(0x9799b5d54f7b9227, 0xb47607190d0dfefb)
-key = 0x07b8e4b6aa98ec245a7da274d3b8146a
-aesni_key = AESNIKey(key)
-@test rand(AESNI1x(x, ctr, aesni_key), UInt128) ≡ 0x60f4c27fe48fe1b8c5f4568a585b0dc0
+@testset "Accelerated AESNI" begin
+    x = zero(__m128i)
+    ctr = __m128i(0x9799b5d54f7b9227, 0xb47607190d0dfefb)
+    key = 0x07b8e4b6aa98ec245a7da274d3b8146a
+    aesni_key = AESNIKey(key)
+    @test rand(AESNI1x(x, ctr, aesni_key), UInt128) ≡ 0x60f4c27fe48fe1b8c5f4568a585b0dc0
 
-r = AESNI1x(key)
-r1 = AESNI4x(split_uint(key, UInt32))
-@test seed_type(r) ≡ UInt128
-@test seed_type(r1) ≡ NTuple{4, UInt32}
-@test copyto!(copy(r), r) == r
-@test copyto!(copy(r1), r1) == r1
-@test UInt128(r.x) ≡ rand(r1, UInt128)
-@test rand(r, UInt128) ≡ rand(r1, UInt128)
-set_counter!(r, 0)
-set_counter!(r1, 1)
-@test rand(r, Tuple{UInt128})[1] ≡ rand(r1, UInt128)
+    r = AESNI1x(key)
+    r1 = AESNI4x(split_uint(key, UInt32))
+    @test seed_type(r) ≡ UInt128
+    @test seed_type(r1) ≡ NTuple{4, UInt32}
+    @test copyto!(copy(r), r) == r
+    @test copyto!(copy(r1), r1) == r1
+    @test UInt128(r.x) ≡ rand(r1, UInt128)
+    @test rand(r, UInt128) ≡ rand(r1, UInt128)
+    set_counter!(r, 0)
+    set_counter!(r1, 1)
+    @test rand(r, Tuple{UInt128})[1] ≡ rand(r1, UInt128)
+end

test/x86/ars.jl

@@ -1,29 +1,31 @@
 import Random: seed!
-using Test: @test
+using Test: @test, @testset
 
 using RandomNumbers
 using Random123
 
 import RandomNumbers: split_uint
 import Random123: __m128i
 
-x = zero(__m128i)
-ctr = __m128i(0x9799b5d54f7b9227, 0xb47607190d0dfefb)
-key = __m128i(0x07b8e4b6aa98ec24, 0x5a7da274d3b8146a)
-@test rand(ARS1x{1}(x, ctr, key), UInt128) ≡ 0x1a0b14c707b64224e548ef12331396ef
-@test rand(ARS1x{2}(x, ctr, key), UInt128) ≡ 0x3ced8e0970690f718336318ba22e8ae1
-@test rand(ARS1x{3}(x, ctr, key), UInt128) ≡ UInt128(__m128i(0xb6621a8b006319e8, 0x67c841642c32fc19))
-@test rand(ARS1x{10}(x, ctr, key), UInt128) ≡ UInt128(__m128i(0xac35df44f996ed82, 0x4e287697bad2f9a2))
+@testset "Accelerated ARS" begin
+    x = zero(__m128i)
+    ctr = __m128i(0x9799b5d54f7b9227, 0xb47607190d0dfefb)
+    key = __m128i(0x07b8e4b6aa98ec24, 0x5a7da274d3b8146a)
+    @test rand(ARS1x{1}(x, ctr, key), UInt128) ≡ 0x1a0b14c707b64224e548ef12331396ef
+    @test rand(ARS1x{2}(x, ctr, key), UInt128) ≡ 0x3ced8e0970690f718336318ba22e8ae1
+    @test rand(ARS1x{3}(x, ctr, key), UInt128) ≡ UInt128(__m128i(0xb6621a8b006319e8, 0x67c841642c32fc19))
+    @test rand(ARS1x{10}(x, ctr, key), UInt128) ≡ UInt128(__m128i(0xac35df44f996ed82, 0x4e287697bad2f9a2))
 
-key = rand(UInt128)
-r = ARS1x(key)
-r1 = ARS4x(split_uint(key, UInt32))
-@test seed_type(r) ≡ UInt128
-@test seed_type(r1) ≡ NTuple{4, UInt32}
-@test copyto!(copy(r), r) == r
-@test copyto!(copy(r1), r1) == r1
-@test UInt128(r.x) ≡ rand(r1, UInt128)
-@test rand(r, UInt128) ≡ rand(r1, UInt128)
-set_counter!(r, 0)
-set_counter!(r1, 1)
-@test rand(r, Tuple{UInt128})[1] ≡ rand(r1, UInt128)
+    key = rand(UInt128)
+    r = ARS1x(key)
+    r1 = ARS4x(split_uint(key, UInt32))
+    @test seed_type(r) ≡ UInt128
+    @test seed_type(r1) ≡ NTuple{4, UInt32}
+    @test copyto!(copy(r), r) == r
+    @test copyto!(copy(r1), r1) == r1
+    @test UInt128(r.x) ≡ rand(r1, UInt128)
+    @test rand(r, UInt128) ≡ rand(r1, UInt128)
+    set_counter!(r, 0)
+    set_counter!(r1, 1)
+    @test rand(r, Tuple{UInt128})[1] ≡ rand(r1, UInt128)
+end