From 18581964cbf2f5bca417c989e444c64ca0e1a1dc Mon Sep 17 00:00:00 2001 From: Tanner Gooding Date: Tue, 18 Apr 2023 14:40:37 -0700 Subject: [PATCH 01/10] Remove unnecessary scenarios from other HWIntrinsic templates --- .../Arm/Shared/AesBinOpTest.template | 158 --------------- .../Arm/Shared/AesUnOpTest.template | 147 -------------- .../Arm/Shared/ExtractTest.template | 134 ------------ .../Arm/Shared/ExtractVectorTest.template | 164 --------------- .../Arm/Shared/InsertScalarTest.template | 164 --------------- .../Shared/InsertSelectedScalarTest.template | 170 ---------------- .../Arm/Shared/InsertTest.template | 167 --------------- .../Shared/LoadAndInsertScalarTest.template | 166 --------------- .../Arm/Shared/StoreBinOpTest.template | 157 --------------- .../Shared/StoreSelectedScalarTest.template | 131 ------------ .../Arm/Shared/StoreUnOpTest.template | 131 ------------ .../X86/Shared/AesBinOpTest.template | 190 ------------------ .../X86/Shared/AesImmOpTest.template | 184 ----------------- .../X86/Shared/AesUnOpTest.template | 177 ---------------- .../X86/Shared/ExtractScalarTest.template | 68 ------- .../X86/Shared/ExtractVector128Test.template | 68 ------- .../X86/Shared/GenericUnOpTest.template | 68 ------- .../X86/Shared/ImmBinOpTest.template | 72 ------- .../X86/Shared/ImmUnOpTest.template | 68 ------- .../X86/Shared/InsertScalarTest.template | 74 ------- .../X86/Shared/InsertVector128Test.template | 72 ------- .../X86/Shared/LoadBinOpTest.template | 70 ------- .../X86/Shared/PclmulqdqOpTest.template | 72 ------- .../Shared/SimdScalarUnOpConvTest.template | 62 ------ .../X86/Shared/SimdScalarUnOpTest.template | 62 ------ .../X86/Shared/SimpleBinOpConvTest.template | 70 ------- .../X86/Shared/SimpleUnOpConvTest.template | 66 ------ .../X86/Shared/StoreBinOpTest.template | 68 ------- .../X86/Shared/StoreUnOpTest.template | 64 ------ 29 files changed, 3264 deletions(-) diff --git a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/AesBinOpTest.template b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/AesBinOpTest.template index 818fd566769a6a..df9807f4927e22 100644 --- a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/AesBinOpTest.template +++ b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/AesBinOpTest.template @@ -38,65 +38,23 @@ namespace JIT.HardwareIntrinsics.Arm // Validates calling via reflection works, using Unsafe.Read test.RunReflectionScenario_UnsafeRead(); - if ({LoadIsa}.IsSupported) - { - // Validates calling via reflection works, using Load - test.RunReflectionScenario_Load(); - } - // Validates passing a static member works test.RunClsVarScenario(); - if ({LoadIsa}.IsSupported) - { - // Validates passing a static member works, using pinning and Load - test.RunClsVarScenario_Load(); - } - // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); - if ({LoadIsa}.IsSupported) - { - // Validates passing a local works, using Load - test.RunLclVarScenario_Load(); - } - // Validates passing the field of a local class works test.RunClassLclFldScenario(); - if ({LoadIsa}.IsSupported) - { - // Validates passing the field of a local class works, using pinning and Load - test.RunClassLclFldScenario_Load(); - } - // Validates passing an instance member of a class works test.RunClassFldScenario(); - if ({LoadIsa}.IsSupported) - { - // Validates passing an instance member of a class works, using pinning and Load - test.RunClassFldScenario_Load(); - } - // Validates passing the field of a local struct works test.RunStructLclFldScenario(); - if ({LoadIsa}.IsSupported) - { - // Validates passing the field of a local struct works, using pinning and Load - test.RunStructLclFldScenario_Load(); - } - // Validates passing an instance member of a struct works test.RunStructFldScenario(); - - if ({LoadIsa}.IsSupported) - { - // Validates passing an instance member of a struct works, using pinning and Load - test.RunStructFldScenario_Load(); - } } else { @@ -189,21 +147,6 @@ namespace JIT.HardwareIntrinsics.Arm Unsafe.Write(testClass._dataTable.outArrayPtr, result); testClass.ValidateResult(testClass._dataTable.outArrayPtr); } - - public void RunStructFldScenario_Load(AesBinaryOpTest__{TestName} testClass) - { - fixed ({Op1VectorType}<{Op1BaseType}>* pFld1 = &_fld1) - fixed ({Op2VectorType}<{Op2BaseType}>* pFld2 = &_fld2) - { - var result = {Isa}.{Method}( - {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(pFld1)), - {LoadIsa}.Load{Op2VectorType}(({Op2BaseType}*)(pFld2)) - ); - - Unsafe.Write(testClass._dataTable.outArrayPtr, result); - testClass.ValidateResult(testClass._dataTable.outArrayPtr); - } - } } private static readonly int LargestVectorSize = {LargestVectorSize}; @@ -286,20 +229,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(_dataTable.outArrayPtr); } - public void RunReflectionScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunReflectionScenario_Load)); - - var result = typeof({Isa}).GetMethod(nameof({Isa}.{Method}), new Type[] { typeof({Op1VectorType}<{Op1BaseType}>), typeof({Op2VectorType}<{Op2BaseType}>) }) - .Invoke(null, new object[] { - {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(_dataTable.inArray1Ptr)), - {LoadIsa}.Load{Op2VectorType}(({Op2BaseType}*)(_dataTable.inArray2Ptr)) - }); - - Unsafe.Write(_dataTable.outArrayPtr, ({RetVectorType}<{RetBaseType}>)(result)); - ValidateResult(_dataTable.outArrayPtr); - } - public void RunClsVarScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario)); @@ -313,23 +242,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(_dataTable.outArrayPtr); } - public void RunClsVarScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario_Load)); - - fixed ({Op1VectorType}<{Op1BaseType}>* pClsVar1 = &_clsVar1) - fixed ({Op2VectorType}<{Op2BaseType}>* pClsVar2 = &_clsVar2) - { - var result = {Isa}.{Method}( - {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(pClsVar1)), - {LoadIsa}.Load{Op2VectorType}(({Op2BaseType}*)(pClsVar2)) - ); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(_dataTable.outArrayPtr); - } - } - public void RunLclVarScenario_UnsafeRead() { TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_UnsafeRead)); @@ -342,18 +254,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(_dataTable.outArrayPtr); } - public void RunLclVarScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_Load)); - - var left = {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(_dataTable.inArray1Ptr)); - var right = {LoadIsa}.Load{Op2VectorType}(({Op2BaseType}*)(_dataTable.inArray2Ptr)); - var result = {Isa}.{Method}(left, right); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(_dataTable.outArrayPtr); - } - public void RunClassLclFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario)); @@ -365,25 +265,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(_dataTable.outArrayPtr); } - public void RunClassLclFldScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario_Load)); - - var test = new AesBinaryOpTest__{TestName}(); - - fixed ({Op1VectorType}<{Op1BaseType}>* pFld1 = &test._fld1) - fixed ({Op2VectorType}<{Op2BaseType}>* pFld2 = &test._fld2) - { - var result = {Isa}.{Method}( - {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(pFld1)), - {LoadIsa}.Load{Op2VectorType}(({Op2BaseType}*)(pFld2)) - ); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(_dataTable.outArrayPtr); - } - } - public void RunClassFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassFldScenario)); @@ -394,23 +275,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(_dataTable.outArrayPtr); } - public void RunClassFldScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClassFldScenario_Load)); - - fixed ({Op1VectorType}<{Op1BaseType}>* pFld1 = &_fld1) - fixed ({Op2VectorType}<{Op2BaseType}>* pFld2 = &_fld2) - { - var result = {Isa}.{Method}( - {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(pFld1)), - {LoadIsa}.Load{Op2VectorType}(({Op2BaseType}*)(pFld2)) - ); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(_dataTable.outArrayPtr); - } - } - public void RunStructLclFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunStructLclFldScenario)); @@ -422,20 +286,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(_dataTable.outArrayPtr); } - public void RunStructLclFldScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunStructLclFldScenario_Load)); - - var test = TestStruct.Create(); - var result = {Isa}.{Method}( - {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(&test._fld1)), - {LoadIsa}.Load{Op2VectorType}(({Op2BaseType}*)(&test._fld2)) - ); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(_dataTable.outArrayPtr); - } - public void RunStructFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunStructFldScenario)); @@ -444,14 +294,6 @@ namespace JIT.HardwareIntrinsics.Arm test.RunStructFldScenario(this); } - public void RunStructFldScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunStructFldScenario_Load)); - - var test = TestStruct.Create(); - test.RunStructFldScenario_Load(this); - } - public void RunUnsupportedScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunUnsupportedScenario)); diff --git a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/AesUnOpTest.template b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/AesUnOpTest.template index e6c9d6e88b5507..1e5588b9c6fece 100644 --- a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/AesUnOpTest.template +++ b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/AesUnOpTest.template @@ -38,65 +38,23 @@ namespace JIT.HardwareIntrinsics.Arm // Validates calling via reflection works, using Unsafe.Read test.RunReflectionScenario_UnsafeRead(); - if ({LoadIsa}.IsSupported) - { - // Validates calling via reflection works, using Load - test.RunReflectionScenario_Load(); - } - // Validates passing a static member works test.RunClsVarScenario(); - if ({LoadIsa}.IsSupported) - { - // Validates passing a static member works, using pinning and Load - test.RunClsVarScenario_Load(); - } - // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); - if ({LoadIsa}.IsSupported) - { - // Validates passing a local works, using Load - test.RunLclVarScenario_Load(); - } - // Validates passing the field of a local class works test.RunClassLclFldScenario(); - if ({LoadIsa}.IsSupported) - { - // Validates passing the field of a local class works, using pinning and Load - test.RunClassLclFldScenario_Load(); - } - // Validates passing an instance member of a class works test.RunClassFldScenario(); - if ({LoadIsa}.IsSupported) - { - // Validates passing an instance member of a class works, using pinning and Load - test.RunClassFldScenario_Load(); - } - // Validates passing the field of a local struct works test.RunStructLclFldScenario(); - if ({LoadIsa}.IsSupported) - { - // Validates passing the field of a local struct works, using pinning and Load - test.RunStructLclFldScenario_Load(); - } - // Validates passing an instance member of a struct works test.RunStructFldScenario(); - - if ({LoadIsa}.IsSupported) - { - // Validates passing an instance member of a struct works, using pinning and Load - test.RunStructFldScenario_Load(); - } } else { @@ -178,19 +136,6 @@ namespace JIT.HardwareIntrinsics.Arm Unsafe.Write(testClass._dataTable.outArrayPtr, result); testClass.ValidateResult(testClass._dataTable.outArrayPtr); } - - public void RunStructFldScenario_Load(AesUnaryOpTest__{TestName} testClass) - { - fixed ({Op1VectorType}<{Op1BaseType}>* pFld = &_fld) - { - var result = {Isa}.{Method}( - {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(pFld)) - ); - - Unsafe.Write(testClass._dataTable.outArrayPtr, result); - testClass.ValidateResult(testClass._dataTable.outArrayPtr); - } - } } private static readonly int LargestVectorSize = {LargestVectorSize}; @@ -263,19 +208,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(_dataTable.outArrayPtr); } - public void RunReflectionScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunReflectionScenario_Load)); - - var result = typeof({Isa}).GetMethod(nameof({Isa}.{Method}), new Type[] { typeof({Op1VectorType}<{Op1BaseType}>) }) - .Invoke(null, new object[] { - {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(_dataTable.inArray1Ptr)) - }); - - Unsafe.Write(_dataTable.outArrayPtr, ({RetVectorType}<{RetBaseType}>)(result)); - ValidateResult(_dataTable.outArrayPtr); - } - public void RunClsVarScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario)); @@ -288,21 +220,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(_dataTable.outArrayPtr); } - public void RunClsVarScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario_Load)); - - fixed ({Op1VectorType}<{Op1BaseType}>* pClsVar = &_clsVar) - { - var result = {Isa}.{Method}( - {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(pClsVar)) - ); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(_dataTable.outArrayPtr); - } - } - public void RunLclVarScenario_UnsafeRead() { TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_UnsafeRead)); @@ -314,17 +231,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(_dataTable.outArrayPtr); } - public void RunLclVarScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_Load)); - - var firstOp = {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(_dataTable.inArray1Ptr)); - var result = {Isa}.{Method}(firstOp); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(_dataTable.outArrayPtr); - } - public void RunClassLclFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario)); @@ -336,23 +242,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(_dataTable.outArrayPtr); } - public void RunClassLclFldScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario_Load)); - - var test = new AesUnaryOpTest__{TestName}(); - - fixed ({Op1VectorType}<{Op1BaseType}>* pFld = &test._fld) - { - var result = {Isa}.{Method}( - {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(pFld)) - ); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(_dataTable.outArrayPtr); - } - } - public void RunClassFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassFldScenario)); @@ -363,21 +252,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(_dataTable.outArrayPtr); } - public void RunClassFldScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClassFldScenario_Load)); - - fixed ({Op1VectorType}<{Op1BaseType}>* pFld = &_fld) - { - var result = {Isa}.{Method}( - {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(pFld)) - ); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(_dataTable.outArrayPtr); - } - } - public void RunStructLclFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunStructLclFldScenario)); @@ -389,19 +263,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(_dataTable.outArrayPtr); } - public void RunStructLclFldScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunStructLclFldScenario_Load)); - - var test = TestStruct.Create(); - var result = {Isa}.{Method}( - {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(&test._fld)) - ); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(_dataTable.outArrayPtr); - } - public void RunStructFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunStructFldScenario)); @@ -410,14 +271,6 @@ namespace JIT.HardwareIntrinsics.Arm test.RunStructFldScenario(this); } - public void RunStructFldScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunStructFldScenario_Load)); - - var test = TestStruct.Create(); - test.RunStructFldScenario_Load(this); - } - public void RunUnsupportedScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunUnsupportedScenario)); diff --git a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/ExtractTest.template b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/ExtractTest.template index 650fe3ed52a239..5feada12628074 100644 --- a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/ExtractTest.template +++ b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/ExtractTest.template @@ -38,65 +38,23 @@ namespace JIT.HardwareIntrinsics.Arm // Validates calling via reflection works, using Unsafe.Read test.RunReflectionScenario_UnsafeRead(); - if ({LoadIsa}.IsSupported) - { - // Validates calling via reflection works, using Load - test.RunReflectionScenario_Load(); - } - // Validates passing a static member works test.RunClsVarScenario(); - if ({LoadIsa}.IsSupported) - { - // Validates passing a static member works, using pinning and Load - test.RunClsVarScenario_Load(); - } - // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); - if ({LoadIsa}.IsSupported) - { - // Validates passing a local works, using Load - test.RunLclVarScenario_Load(); - } - // Validates passing the field of a local class works test.RunClassLclFldScenario(); - if ({LoadIsa}.IsSupported) - { - // Validates passing the field of a local class works, using pinning and Load - test.RunClassLclFldScenario_Load(); - } - // Validates passing an instance member of a class works test.RunClassFldScenario(); - if ({LoadIsa}.IsSupported) - { - // Validates passing an instance member of a class works, using pinning and Load - test.RunClassFldScenario_Load(); - } - // Validates passing the field of a local struct works test.RunStructLclFldScenario(); - if ({LoadIsa}.IsSupported) - { - // Validates passing the field of a local struct works, using pinning and Load - test.RunStructLclFldScenario_Load(); - } - // Validates passing an instance member of a struct works test.RunStructFldScenario(); - - if ({LoadIsa}.IsSupported) - { - // Validates passing an instance member of a struct works, using pinning and Load - test.RunStructFldScenario_Load(); - } } else { @@ -169,16 +127,6 @@ namespace JIT.HardwareIntrinsics.Arm testClass.ValidateResult(_fld1, result); } - - public void RunStructFldScenario_Load(ExtractTest__{TestName} testClass) - { - fixed ({Op1VectorType}<{Op1BaseType}>* pFld1 = &_fld1) - { - var result = {Isa}.{Method}({LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)pFld1), ElementIndex); - - testClass.ValidateResult(_fld1, result); - } - } } private static readonly int LargestVectorSize = {LargestVectorSize}; @@ -253,19 +201,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(_dataTable.inArray1Ptr, ({Op1BaseType})result); } - public void RunReflectionScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunReflectionScenario_Load)); - - var result = typeof({Isa}).GetMethod(nameof({Isa}.{Method}), new Type[] { typeof({Op1VectorType}<{Op1BaseType}>), typeof(byte) }) - .Invoke(null, new object[] { - {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(_dataTable.inArray1Ptr)), - ElementIndex - }); - - ValidateResult(_dataTable.inArray1Ptr, ({Op1BaseType})result); - } - public void RunClsVarScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario)); @@ -275,18 +210,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(_clsVar1, result); } - public void RunClsVarScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario_Load)); - - fixed ({Op1VectorType}<{Op1BaseType}>* pClsVar1 = &_clsVar1) - { - var result = {Isa}.{Method}({LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)pClsVar1), ElementIndex); - - ValidateResult(_clsVar1, result); - } - } - public void RunLclVarScenario_UnsafeRead() { TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_UnsafeRead)); @@ -297,16 +220,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(op1, result); } - public void RunLclVarScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_Load)); - - var op1 = {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(_dataTable.inArray1Ptr)); - var result = {Isa}.{Method}(op1, ElementIndex); - - ValidateResult(op1, result); - } - public void RunClassLclFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario)); @@ -317,20 +230,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(test._fld1, result); } - public void RunClassLclFldScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario_Load)); - - var test = new ExtractTest__{TestName}(); - - fixed ({Op1VectorType}<{Op1BaseType}>* pFld1 = &test._fld1) - { - var result = {Isa}.{Method}({LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(pFld1)), ElementIndex); - - ValidateResult(test._fld1, result); - } - } - public void RunClassFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassFldScenario)); @@ -340,18 +239,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(_fld1, result); } - public void RunClassFldScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClassFldScenario_Load)); - - fixed ({Op1VectorType}<{Op1BaseType}>* pFld1 = &_fld1) - { - var result = {Isa}.{Method}({LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(pFld1)), ElementIndex); - - ValidateResult(_fld1, result); - } - } - public void RunStructLclFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunStructLclFldScenario)); @@ -362,19 +249,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(test._fld1, result); } - public void RunStructLclFldScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunStructLclFldScenario_Load)); - - var test = TestStruct.Create(); - var result = {Isa}.{Method}( - {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)&test._fld1), - ElementIndex - ); - - ValidateResult(test._fld1, result); - } - public void RunStructFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunStructFldScenario)); @@ -383,14 +257,6 @@ namespace JIT.HardwareIntrinsics.Arm test.RunStructFldScenario(this); } - public void RunStructFldScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunStructFldScenario_Load)); - - var test = TestStruct.Create(); - test.RunStructFldScenario_Load(this); - } - public void RunUnsupportedScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunUnsupportedScenario)); diff --git a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/ExtractVectorTest.template b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/ExtractVectorTest.template index 7bfdc0f68ffea5..8a6127091ebf49 100644 --- a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/ExtractVectorTest.template +++ b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/ExtractVectorTest.template @@ -38,65 +38,23 @@ namespace JIT.HardwareIntrinsics.Arm // Validates calling via reflection works, using Unsafe.Read test.RunReflectionScenario_UnsafeRead(); - if ({LoadIsa}.IsSupported) - { - // Validates calling via reflection works, using Load - test.RunReflectionScenario_Load(); - } - // Validates passing a static member works test.RunClsVarScenario(); - if ({LoadIsa}.IsSupported) - { - // Validates passing a static member works, using pinning and Load - test.RunClsVarScenario_Load(); - } - // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); - if ({LoadIsa}.IsSupported) - { - // Validates passing a local works, using Load - test.RunLclVarScenario_Load(); - } - // Validates passing the field of a local class works test.RunClassLclFldScenario(); - if ({LoadIsa}.IsSupported) - { - // Validates passing the field of a local class works, using pinning and Load - test.RunClassLclFldScenario_Load(); - } - // Validates passing an instance member of a class works test.RunClassFldScenario(); - if ({LoadIsa}.IsSupported) - { - // Validates passing an instance member of a class works, using pinning and Load - test.RunClassFldScenario_Load(); - } - // Validates passing the field of a local struct works test.RunStructLclFldScenario(); - if ({LoadIsa}.IsSupported) - { - // Validates passing the field of a local struct works, using pinning and Load - test.RunStructLclFldScenario_Load(); - } - // Validates passing an instance member of a struct works test.RunStructFldScenario(); - - if ({LoadIsa}.IsSupported) - { - // Validates passing an instance member of a struct works, using pinning and Load - test.RunStructFldScenario_Load(); - } } else { @@ -190,22 +148,6 @@ namespace JIT.HardwareIntrinsics.Arm Unsafe.Write(testClass._dataTable.outArrayPtr, result); testClass.ValidateResult(_fld1, _fld2, testClass._dataTable.outArrayPtr); } - - public void RunStructFldScenario_Load(ExtractVectorTest__{TestName} testClass) - { - fixed ({Op1VectorType}<{Op1BaseType}>* pFld1 = &_fld1) - fixed ({Op2VectorType}<{Op2BaseType}>* pFld2 = &_fld2) - { - var result = {Isa}.{Method}( - {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)pFld1), - {LoadIsa}.Load{Op2VectorType}(({Op2BaseType}*)pFld2), - ElementIndex - ); - - Unsafe.Write(testClass._dataTable.outArrayPtr, result); - testClass.ValidateResult(_fld1, _fld2, testClass._dataTable.outArrayPtr); - } - } } private static readonly int LargestVectorSize = {LargestVectorSize}; @@ -295,21 +237,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(_dataTable.inArray1Ptr, _dataTable.inArray2Ptr, _dataTable.outArrayPtr); } - public void RunReflectionScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunReflectionScenario_Load)); - - var result = typeof({Isa}).GetMethod(nameof({Isa}.{Method}), new Type[] { typeof({Op1VectorType}<{Op1BaseType}>), typeof({Op2VectorType}<{Op2BaseType}>), typeof(byte) }) - .Invoke(null, new object[] { - {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(_dataTable.inArray1Ptr)), - {LoadIsa}.Load{Op2VectorType}(({Op2BaseType}*)(_dataTable.inArray2Ptr)), - ElementIndex - }); - - Unsafe.Write(_dataTable.outArrayPtr, ({RetVectorType}<{RetBaseType}>)(result)); - ValidateResult(_dataTable.inArray1Ptr, _dataTable.inArray2Ptr, _dataTable.outArrayPtr); - } - public void RunClsVarScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario)); @@ -324,24 +251,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(_clsVar1, _clsVar2, _dataTable.outArrayPtr); } - public void RunClsVarScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario_Load)); - - fixed ({Op1VectorType}<{Op1BaseType}>* pClsVar1 = &_clsVar1) - fixed ({Op2VectorType}<{Op2BaseType}>* pClsVar2 = &_clsVar2) - { - var result = {Isa}.{Method}( - {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(pClsVar1)), - {LoadIsa}.Load{Op2VectorType}(({Op2BaseType}*)(pClsVar2)), - ElementIndex - ); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(_clsVar1, _clsVar2, _dataTable.outArrayPtr); - } - } - public void RunLclVarScenario_UnsafeRead() { TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_UnsafeRead)); @@ -354,18 +263,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(op1, op2, _dataTable.outArrayPtr); } - public void RunLclVarScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_Load)); - - var op1 = {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(_dataTable.inArray1Ptr)); - var op2 = {LoadIsa}.Load{Op2VectorType}(({Op2BaseType}*)(_dataTable.inArray2Ptr)); - var result = {Isa}.{Method}(op1, op2, ElementIndex); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(op1, op2, _dataTable.outArrayPtr); - } - public void RunClassLclFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario)); @@ -377,26 +274,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(test._fld1, test._fld2, _dataTable.outArrayPtr); } - public void RunClassLclFldScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario_Load)); - - var test = new ExtractVectorTest__{TestName}(); - - fixed ({Op1VectorType}<{Op1BaseType}>* pFld1 = &test._fld1) - fixed ({Op2VectorType}<{Op2BaseType}>* pFld2 = &test._fld2) - { - var result = {Isa}.{Method}( - {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)pFld1), - {LoadIsa}.Load{Op2VectorType}(({Op2BaseType}*)pFld2), - ElementIndex - ); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(test._fld1, test._fld2, _dataTable.outArrayPtr); - } - } - public void RunClassFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassFldScenario)); @@ -407,24 +284,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(_fld1, _fld2, _dataTable.outArrayPtr); } - public void RunClassFldScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClassFldScenario_Load)); - - fixed ({Op1VectorType}<{Op1BaseType}>* pFld1 = &_fld1) - fixed ({Op2VectorType}<{Op2BaseType}>* pFld2 = &_fld2) - { - var result = {Isa}.{Method}( - {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)pFld1), - {LoadIsa}.Load{Op2VectorType}(({Op2BaseType}*)pFld2), - ElementIndex - ); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(_fld1, _fld2, _dataTable.outArrayPtr); - } - } - public void RunStructLclFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunStructLclFldScenario)); @@ -436,21 +295,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(test._fld1, test._fld2, _dataTable.outArrayPtr); } - public void RunStructLclFldScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunStructLclFldScenario_Load)); - - var test = TestStruct.Create(); - var result = {Isa}.{Method}( - {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(&test._fld1)), - {LoadIsa}.Load{Op2VectorType}(({Op2BaseType}*)(&test._fld2)), - ElementIndex - ); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(test._fld1, test._fld2, _dataTable.outArrayPtr); - } - public void RunStructFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunStructFldScenario)); @@ -459,14 +303,6 @@ namespace JIT.HardwareIntrinsics.Arm test.RunStructFldScenario(this); } - public void RunStructFldScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunStructFldScenario_Load)); - - var test = TestStruct.Create(); - test.RunStructFldScenario_Load(this); - } - public void RunUnsupportedScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunUnsupportedScenario)); diff --git a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/InsertScalarTest.template b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/InsertScalarTest.template index 24cbaa509f1f3e..5b6c0ddb5a2a6b 100644 --- a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/InsertScalarTest.template +++ b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/InsertScalarTest.template @@ -38,65 +38,23 @@ namespace JIT.HardwareIntrinsics.Arm // Validates calling via reflection works, using Unsafe.Read test.RunReflectionScenario_UnsafeRead(); - if ({LoadIsa}.IsSupported) - { - // Validates calling via reflection works, using Load - test.RunReflectionScenario_Load(); - } - // Validates passing a static member works test.RunClsVarScenario(); - if ({LoadIsa}.IsSupported) - { - // Validates passing a static member works, using pinning and Load - test.RunClsVarScenario_Load(); - } - // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); - if ({LoadIsa}.IsSupported) - { - // Validates passing a local works, using Load - test.RunLclVarScenario_Load(); - } - // Validates passing the field of a local class works test.RunClassLclFldScenario(); - if ({LoadIsa}.IsSupported) - { - // Validates passing the field of a local class works, using pinning and Load - test.RunClassLclFldScenario_Load(); - } - // Validates passing an instance member of a class works test.RunClassFldScenario(); - if ({LoadIsa}.IsSupported) - { - // Validates passing an instance member of a class works, using pinning and Load - test.RunClassFldScenario_Load(); - } - // Validates passing the field of a local struct works test.RunStructLclFldScenario(); - if ({LoadIsa}.IsSupported) - { - // Validates passing the field of a local struct works, using pinning and Load - test.RunStructLclFldScenario_Load(); - } - // Validates passing an instance member of a struct works test.RunStructFldScenario(); - - if ({LoadIsa}.IsSupported) - { - // Validates passing an instance member of a struct works, using pinning and Load - test.RunStructFldScenario_Load(); - } } else { @@ -190,22 +148,6 @@ namespace JIT.HardwareIntrinsics.Arm Unsafe.Write(testClass._dataTable.outArrayPtr, result); testClass.ValidateResult(_fld1, _fld3, testClass._dataTable.outArrayPtr); } - - public void RunStructFldScenario_Load(InsertScalarTest__{TestName} testClass) - { - fixed ({Op1VectorType}<{Op1BaseType}>* pFld1 = &_fld1) - fixed ({Op3VectorType}<{Op3BaseType}>* pFld2 = &_fld3) - { - var result = {Isa}.{Method}( - {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)pFld1), - {ElementIndex}, - {LoadIsa}.Load{Op3VectorType}(({Op3BaseType}*)pFld2) - ); - - Unsafe.Write(testClass._dataTable.outArrayPtr, result); - testClass.ValidateResult(_fld1, _fld3, testClass._dataTable.outArrayPtr); - } - } } private static readonly int LargestVectorSize = {LargestVectorSize}; @@ -295,21 +237,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(_dataTable.inArray1Ptr, _dataTable.inArray3Ptr, _dataTable.outArrayPtr); } - public void RunReflectionScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunReflectionScenario_Load)); - - var result = typeof({Isa}).GetMethod(nameof({Isa}.{Method}), new Type[] { typeof({Op1VectorType}<{Op1BaseType}>), typeof(byte), typeof({Op3VectorType}<{Op3BaseType}>) }) - .Invoke(null, new object[] { - {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(_dataTable.inArray1Ptr)), - ElementIndex, - {LoadIsa}.Load{Op3VectorType}(({Op3BaseType}*)(_dataTable.inArray3Ptr)) - }); - - Unsafe.Write(_dataTable.outArrayPtr, ({RetVectorType}<{RetBaseType}>)(result)); - ValidateResult(_dataTable.inArray1Ptr, _dataTable.inArray3Ptr, _dataTable.outArrayPtr); - } - public void RunClsVarScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario)); @@ -324,24 +251,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(_clsVar1, _clsVar3, _dataTable.outArrayPtr); } - public void RunClsVarScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario_Load)); - - fixed ({Op1VectorType}<{Op1BaseType}>* pClsVar1 = &_clsVar1) - fixed ({Op3VectorType}<{Op3BaseType}>* pClsVar3 = &_clsVar3) - { - var result = {Isa}.{Method}( - {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(pClsVar1)), - {ElementIndex}, - {LoadIsa}.Load{Op3VectorType}(({Op3BaseType}*)(pClsVar3)) - ); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(_clsVar1, _clsVar3, _dataTable.outArrayPtr); - } - } - public void RunLclVarScenario_UnsafeRead() { TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_UnsafeRead)); @@ -354,18 +263,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(op1, op3, _dataTable.outArrayPtr); } - public void RunLclVarScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_Load)); - - var op1 = {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(_dataTable.inArray1Ptr)); - var op3 = {LoadIsa}.Load{Op3VectorType}(({Op3BaseType}*)(_dataTable.inArray3Ptr)); - var result = {Isa}.{Method}(op1, {ElementIndex}, op3); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(op1, op3, _dataTable.outArrayPtr); - } - public void RunClassLclFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario)); @@ -377,26 +274,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(test._fld1, test._fld3, _dataTable.outArrayPtr); } - public void RunClassLclFldScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario_Load)); - - var test = new InsertScalarTest__{TestName}(); - - fixed ({Op1VectorType}<{Op1BaseType}>* pFld1 = &test._fld1) - fixed ({Op3VectorType}<{Op3BaseType}>* pFld2 = &test._fld3) - { - var result = {Isa}.{Method}( - {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)pFld1), - {ElementIndex}, - {LoadIsa}.Load{Op3VectorType}(({Op3BaseType}*)pFld2) - ); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(test._fld1, test._fld3, _dataTable.outArrayPtr); - } - } - public void RunClassFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassFldScenario)); @@ -407,24 +284,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(_fld1, _fld3, _dataTable.outArrayPtr); } - public void RunClassFldScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClassFldScenario_Load)); - - fixed ({Op1VectorType}<{Op1BaseType}>* pFld1 = &_fld1) - fixed ({Op3VectorType}<{Op3BaseType}>* pFld2 = &_fld3) - { - var result = {Isa}.{Method}( - {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)pFld1), - {ElementIndex}, - {LoadIsa}.Load{Op3VectorType}(({Op3BaseType}*)pFld2) - ); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(_fld1, _fld3, _dataTable.outArrayPtr); - } - } - public void RunStructLclFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunStructLclFldScenario)); @@ -436,21 +295,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(test._fld1, test._fld3, _dataTable.outArrayPtr); } - public void RunStructLclFldScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunStructLclFldScenario_Load)); - - var test = TestStruct.Create(); - var result = {Isa}.{Method}( - {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(&test._fld1)), - {ElementIndex}, - {LoadIsa}.Load{Op3VectorType}(({Op3BaseType}*)(&test._fld3)) - ); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(test._fld1, test._fld3, _dataTable.outArrayPtr); - } - public void RunStructFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunStructFldScenario)); @@ -459,14 +303,6 @@ namespace JIT.HardwareIntrinsics.Arm test.RunStructFldScenario(this); } - public void RunStructFldScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunStructFldScenario_Load)); - - var test = TestStruct.Create(); - test.RunStructFldScenario_Load(this); - } - public void RunUnsupportedScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunUnsupportedScenario)); diff --git a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/InsertSelectedScalarTest.template b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/InsertSelectedScalarTest.template index 7fd251179af20c..6ae12a694697a6 100644 --- a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/InsertSelectedScalarTest.template +++ b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/InsertSelectedScalarTest.template @@ -38,65 +38,23 @@ namespace JIT.HardwareIntrinsics.Arm // Validates calling via reflection works, using Unsafe.Read test.RunReflectionScenario_UnsafeRead(); - if ({LoadIsa}.IsSupported) - { - // Validates calling via reflection works, using Load - test.RunReflectionScenario_Load(); - } - // Validates passing a static member works test.RunClsVarScenario(); - if ({LoadIsa}.IsSupported) - { - // Validates passing a static member works, using pinning and Load - test.RunClsVarScenario_Load(); - } - // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); - if ({LoadIsa}.IsSupported) - { - // Validates passing a local works, using Load - test.RunLclVarScenario_Load(); - } - // Validates passing the field of a local class works test.RunClassLclFldScenario(); - if ({LoadIsa}.IsSupported) - { - // Validates passing the field of a local class works, using pinning and Load - test.RunClassLclFldScenario_Load(); - } - // Validates passing an instance member of a class works test.RunClassFldScenario(); - if ({LoadIsa}.IsSupported) - { - // Validates passing an instance member of a class works, using pinning and Load - test.RunClassFldScenario_Load(); - } - // Validates passing the field of a local struct works test.RunStructLclFldScenario(); - if ({LoadIsa}.IsSupported) - { - // Validates passing the field of a local struct works, using pinning and Load - test.RunStructLclFldScenario_Load(); - } - // Validates passing an instance member of a struct works test.RunStructFldScenario(); - - if ({LoadIsa}.IsSupported) - { - // Validates passing an instance member of a struct works, using pinning and Load - test.RunStructFldScenario_Load(); - } } else { @@ -190,23 +148,6 @@ namespace JIT.HardwareIntrinsics.Arm Unsafe.Write(testClass._dataTable.outArrayPtr, result); testClass.ValidateResult(_fld1, _fld3, testClass._dataTable.outArrayPtr); } - - public void RunStructFldScenario_Load(InsertSelectedScalarTest__{TestName} testClass) - { - fixed ({Op1VectorType}<{Op1BaseType}>* pFld1 = &_fld1) - fixed ({Op3VectorType}<{Op3BaseType}>* pFld2 = &_fld3) - { - var result = {Isa}.{Method}( - {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)pFld1), - {ElementIndex1}, - {LoadIsa}.Load{Op3VectorType}(({Op3BaseType}*)pFld2), - {ElementIndex2} - ); - - Unsafe.Write(testClass._dataTable.outArrayPtr, result); - testClass.ValidateResult(_fld1, _fld3, testClass._dataTable.outArrayPtr); - } - } } private static readonly int LargestVectorSize = {LargestVectorSize}; @@ -300,22 +241,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(_dataTable.inArray1Ptr, _dataTable.inArray3Ptr, _dataTable.outArrayPtr); } - public void RunReflectionScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunReflectionScenario_Load)); - - var result = typeof({Isa}).GetMethod(nameof({Isa}.{Method}), new Type[] { typeof({Op1VectorType}<{Op1BaseType}>), typeof(byte), typeof({Op3VectorType}<{Op3BaseType}>), typeof(byte) }) - .Invoke(null, new object[] { - {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(_dataTable.inArray1Ptr)), - ElementIndex1, - {LoadIsa}.Load{Op3VectorType}(({Op3BaseType}*)(_dataTable.inArray3Ptr)), - ElementIndex2 - }); - - Unsafe.Write(_dataTable.outArrayPtr, ({RetVectorType}<{RetBaseType}>)(result)); - ValidateResult(_dataTable.inArray1Ptr, _dataTable.inArray3Ptr, _dataTable.outArrayPtr); - } - public void RunClsVarScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario)); @@ -331,25 +256,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(_clsVar1, _clsVar3, _dataTable.outArrayPtr); } - public void RunClsVarScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario_Load)); - - fixed ({Op1VectorType}<{Op1BaseType}>* pClsVar1 = &_clsVar1) - fixed ({Op3VectorType}<{Op3BaseType}>* pClsVar3 = &_clsVar3) - { - var result = {Isa}.{Method}( - {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(pClsVar1)), - {ElementIndex1}, - {LoadIsa}.Load{Op3VectorType}(({Op3BaseType}*)(pClsVar3)), - {ElementIndex2} - ); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(_clsVar1, _clsVar3, _dataTable.outArrayPtr); - } - } - public void RunLclVarScenario_UnsafeRead() { TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_UnsafeRead)); @@ -362,18 +268,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(op1, op3, _dataTable.outArrayPtr); } - public void RunLclVarScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_Load)); - - var op1 = {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(_dataTable.inArray1Ptr)); - var op3 = {LoadIsa}.Load{Op3VectorType}(({Op3BaseType}*)(_dataTable.inArray3Ptr)); - var result = {Isa}.{Method}(op1, {ElementIndex1}, op3, {ElementIndex2}); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(op1, op3, _dataTable.outArrayPtr); - } - public void RunClassLclFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario)); @@ -385,27 +279,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(test._fld1, test._fld3, _dataTable.outArrayPtr); } - public void RunClassLclFldScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario_Load)); - - var test = new InsertSelectedScalarTest__{TestName}(); - - fixed ({Op1VectorType}<{Op1BaseType}>* pFld1 = &test._fld1) - fixed ({Op3VectorType}<{Op3BaseType}>* pFld2 = &test._fld3) - { - var result = {Isa}.{Method}( - {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)pFld1), - {ElementIndex1}, - {LoadIsa}.Load{Op3VectorType}(({Op3BaseType}*)pFld2), - {ElementIndex2} - ); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(test._fld1, test._fld3, _dataTable.outArrayPtr); - } - } - public void RunClassFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassFldScenario)); @@ -416,25 +289,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(_fld1, _fld3, _dataTable.outArrayPtr); } - public void RunClassFldScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClassFldScenario_Load)); - - fixed ({Op1VectorType}<{Op1BaseType}>* pFld1 = &_fld1) - fixed ({Op3VectorType}<{Op3BaseType}>* pFld2 = &_fld3) - { - var result = {Isa}.{Method}( - {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)pFld1), - {ElementIndex1}, - {LoadIsa}.Load{Op3VectorType}(({Op3BaseType}*)pFld2), - {ElementIndex2} - ); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(_fld1, _fld3, _dataTable.outArrayPtr); - } - } - public void RunStructLclFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunStructLclFldScenario)); @@ -446,22 +300,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(test._fld1, test._fld3, _dataTable.outArrayPtr); } - public void RunStructLclFldScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunStructLclFldScenario_Load)); - - var test = TestStruct.Create(); - var result = {Isa}.{Method}( - {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(&test._fld1)), - {ElementIndex1}, - {LoadIsa}.Load{Op3VectorType}(({Op3BaseType}*)(&test._fld3)), - {ElementIndex2} - ); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(test._fld1, test._fld3, _dataTable.outArrayPtr); - } - public void RunStructFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunStructFldScenario)); @@ -470,14 +308,6 @@ namespace JIT.HardwareIntrinsics.Arm test.RunStructFldScenario(this); } - public void RunStructFldScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunStructFldScenario_Load)); - - var test = TestStruct.Create(); - test.RunStructFldScenario_Load(this); - } - public void RunUnsupportedScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunUnsupportedScenario)); diff --git a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/InsertTest.template b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/InsertTest.template index 2164bcc00d9a67..43d7450e0f46ff 100644 --- a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/InsertTest.template +++ b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/InsertTest.template @@ -38,65 +38,23 @@ namespace JIT.HardwareIntrinsics.Arm // Validates calling via reflection works, using Unsafe.Read test.RunReflectionScenario_UnsafeRead(); - if ({LoadIsa}.IsSupported) - { - // Validates calling via reflection works, using Load - test.RunReflectionScenario_Load(); - } - // Validates passing a static member works test.RunClsVarScenario(); - if ({LoadIsa}.IsSupported) - { - // Validates passing a static member works, using pinning and Load - test.RunClsVarScenario_Load(); - } - // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); - if ({LoadIsa}.IsSupported) - { - // Validates passing a local works, using Load - test.RunLclVarScenario_Load(); - } - // Validates passing the field of a local class works test.RunClassLclFldScenario(); - if ({LoadIsa}.IsSupported) - { - // Validates passing the field of a local class works, using pinning and Load - test.RunClassLclFldScenario_Load(); - } - // Validates passing an instance member of a class works test.RunClassFldScenario(); - if ({LoadIsa}.IsSupported) - { - // Validates passing an instance member of a class works, using pinning and Load - test.RunClassFldScenario_Load(); - } - // Validates passing the field of a local struct works test.RunStructLclFldScenario(); - if ({LoadIsa}.IsSupported) - { - // Validates passing the field of a local struct works, using pinning and Load - test.RunStructLclFldScenario_Load(); - } - // Validates passing an instance member of a struct works test.RunStructFldScenario(); - - if ({LoadIsa}.IsSupported) - { - // Validates passing an instance member of a struct works, using pinning and Load - test.RunStructFldScenario_Load(); - } } else { @@ -182,22 +140,6 @@ namespace JIT.HardwareIntrinsics.Arm Unsafe.Write(testClass._dataTable.outArrayPtr, result); testClass.ValidateResult(_fld1, _fld3, testClass._dataTable.outArrayPtr); } - - public void RunStructFldScenario_Load(InsertTest__{TestName} testClass) - { - fixed ({Op1VectorType}<{Op1BaseType}>* pFld1 = &_fld1) - fixed ({Op1BaseType}* pFld3 = &_fld3) - { - var result = {Isa}.{Method}( - {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)pFld1), - ElementIndex, - *pFld3 - ); - - Unsafe.Write(testClass._dataTable.outArrayPtr, result); - testClass.ValidateResult(_fld1, _fld3, testClass._dataTable.outArrayPtr); - } - } } private static readonly int LargestVectorSize = {LargestVectorSize}; @@ -286,23 +228,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(_dataTable.inArray1Ptr, op3, _dataTable.outArrayPtr); } - public void RunReflectionScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunReflectionScenario_Load)); - - {Op1BaseType} op3 = {NextValueOp3}; - - var result = typeof({Isa}).GetMethod(nameof({Isa}.{Method}), new Type[] { typeof({Op1VectorType}<{Op1BaseType}>), typeof(byte), typeof({Op1BaseType}) }) - .Invoke(null, new object[] { - {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(_dataTable.inArray1Ptr)), - ElementIndex, - op3 - }); - - Unsafe.Write(_dataTable.outArrayPtr, ({RetVectorType}<{RetBaseType}>)(result)); - ValidateResult(_dataTable.inArray1Ptr, op3, _dataTable.outArrayPtr); - } - public void RunClsVarScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario)); @@ -317,24 +242,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(_clsVar1, _clsVar3, _dataTable.outArrayPtr); } - public void RunClsVarScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario_Load)); - - fixed ({Op1VectorType}<{Op1BaseType}>* pClsVar1 = &_clsVar1) - fixed ({Op1BaseType}* pClsVar3 = &_clsVar3) - { - var result = {Isa}.{Method}( - {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)pClsVar1), - ElementIndex, - *pClsVar3 - ); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(_clsVar1, _clsVar3, _dataTable.outArrayPtr); - } - } - public void RunLclVarScenario_UnsafeRead() { TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_UnsafeRead)); @@ -348,19 +255,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(op1, op3, _dataTable.outArrayPtr); } - public void RunLclVarScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_Load)); - - var op1 = {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(_dataTable.inArray1Ptr)); - var op3 = {NextValueOp3}; - - var result = {Isa}.{Method}(op1, ElementIndex, op3); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(op1, op3, _dataTable.outArrayPtr); - } - public void RunClassLclFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario)); @@ -372,26 +266,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(test._fld1, test._fld3, _dataTable.outArrayPtr); } - public void RunClassLclFldScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario_Load)); - - var test = new InsertTest__{TestName}(); - - fixed ({Op1VectorType}<{Op1BaseType}>* pFld1 = &test._fld1) - fixed ({Op1BaseType}* pFld3 = &test._fld3) - { - var result = {Isa}.{Method}( - {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)pFld1), - ElementIndex, - *pFld3 - ); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(test._fld1, test._fld3, _dataTable.outArrayPtr); - } - } - public void RunClassFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassFldScenario)); @@ -402,24 +276,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(_fld1, _fld3, _dataTable.outArrayPtr); } - public void RunClassFldScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClassFldScenario_Load)); - - fixed ({Op1VectorType}<{Op1BaseType}>* pFld1 = &_fld1) - fixed ({Op1BaseType}* pFld3 = &_fld3) - { - var result = {Isa}.{Method}( - {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)pFld1), - ElementIndex, - *pFld3 - ); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(_fld1, _fld3, _dataTable.outArrayPtr); - } - } - public void RunStructLclFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunStructLclFldScenario)); @@ -431,21 +287,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(test._fld1, test._fld3, _dataTable.outArrayPtr); } - public void RunStructLclFldScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunStructLclFldScenario_Load)); - - var test = TestStruct.Create(); - var result = {Isa}.{Method}( - {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(&test._fld1)), - ElementIndex, - test._fld3 - ); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(test._fld1, test._fld3, _dataTable.outArrayPtr); - } - public void RunStructFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunStructFldScenario)); @@ -454,14 +295,6 @@ namespace JIT.HardwareIntrinsics.Arm test.RunStructFldScenario(this); } - public void RunStructFldScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunStructFldScenario_Load)); - - var test = TestStruct.Create(); - test.RunStructFldScenario_Load(this); - } - public void RunUnsupportedScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunUnsupportedScenario)); diff --git a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/LoadAndInsertScalarTest.template b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/LoadAndInsertScalarTest.template index cbdaa300879889..a00c724302ef4d 100644 --- a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/LoadAndInsertScalarTest.template +++ b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/LoadAndInsertScalarTest.template @@ -39,65 +39,23 @@ namespace JIT.HardwareIntrinsics.Arm // Validates calling via reflection works, using Unsafe.Read test.RunReflectionScenario_UnsafeRead(); - if ({LoadIsa}.IsSupported) - { - // Validates calling via reflection works, using Load - test.RunReflectionScenario_Load(); - } - // Validates passing a static member works test.RunClsVarScenario(); - if ({LoadIsa}.IsSupported) - { - // Validates passing a static member works, using pinning and Load - test.RunClsVarScenario_Load(); - } - // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); - if ({LoadIsa}.IsSupported) - { - // Validates passing a local works, using Load - test.RunLclVarScenario_Load(); - } - // Validates passing the field of a local class works test.RunClassLclFldScenario(); - if ({LoadIsa}.IsSupported) - { - // Validates passing the field of a local class works, using pinning and Load - test.RunClassLclFldScenario_Load(); - } - // Validates passing an instance member of a class works test.RunClassFldScenario(); - if ({LoadIsa}.IsSupported) - { - // Validates passing an instance member of a class works, using pinning and Load - test.RunClassFldScenario_Load(); - } - // Validates passing the field of a local struct works test.RunStructLclFldScenario(); - if ({LoadIsa}.IsSupported) - { - // Validates passing the field of a local struct works, using pinning and Load - test.RunStructLclFldScenario_Load(); - } - // Validates passing an instance member of a struct works test.RunStructFldScenario(); - - if ({LoadIsa}.IsSupported) - { - // Validates passing an instance member of a struct works, using pinning and Load - test.RunStructFldScenario_Load(); - } } else { @@ -187,22 +145,6 @@ namespace JIT.HardwareIntrinsics.Arm testClass.ValidateResult(_fld1, _fld3, testClass._dataTable.outArrayPtr); } - - public void RunStructFldScenario_Load(LoadAndInsertTest__{TestName} testClass) - { - fixed ({Op1VectorType}<{Op1BaseType}>* pFld1 = &_fld1) - fixed ({Op1BaseType}* pFld3 = &_fld3) - { - var result = {Isa}.{Method}( - {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)pFld1), - {ElementIndex}, - pFld3 - ); - - Unsafe.Write(testClass._dataTable.outArrayPtr, result); - testClass.ValidateResult(_fld1, _fld3, testClass._dataTable.outArrayPtr); - } - } } private static readonly int LargestVectorSize = {LargestVectorSize}; @@ -295,23 +237,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(_dataTable.inArray1Ptr, op3, _dataTable.outArrayPtr); } - public void RunReflectionScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunReflectionScenario_Load)); - - {Op1BaseType} op3 = {NextValueOp3}; - - var result = typeof({Isa}).GetMethod(nameof({Isa}.{Method}), new Type[] { typeof({Op1VectorType}<{Op1BaseType}>), typeof(byte), typeof({Op1BaseType}*) }) - .Invoke(null, new object[] { - {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(_dataTable.inArray1Ptr)), - ElementIndex, - Pointer.Box(&op3, typeof({Op1BaseType}*)) - }); - - Unsafe.Write(_dataTable.outArrayPtr, ({RetVectorType}<{RetBaseType}>)(result)); - ValidateResult(_dataTable.inArray1Ptr, op3, _dataTable.outArrayPtr); - } - public void RunClsVarScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario)); @@ -328,23 +253,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(_clsVar1, _clsVar3, _dataTable.outArrayPtr); } - public void RunClsVarScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario_Load)); - - fixed ({Op1VectorType}<{Op1BaseType}>* pClsVar1 = &_clsVar1) - fixed ({Op1BaseType}* pClsVar3 = &_clsVar3) - { - var result = {Isa}.{Method}( - {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)pClsVar1), - {ElementIndex}, - pClsVar3 - ); - Unsafe.Write(_dataTable.outArrayPtr, result); - } - ValidateResult(_clsVar1, _clsVar3, _dataTable.outArrayPtr); - } - public void RunLclVarScenario_UnsafeRead() { TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_UnsafeRead)); @@ -358,19 +266,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(op1, op3, _dataTable.outArrayPtr); } - public void RunLclVarScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_Load)); - - var op1 = {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(_dataTable.inArray1Ptr)); - var op3 = {NextValueOp3}; - - var result = {Isa}.{Method}(op1, {ElementIndex}, &op3); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(op1, op3, _dataTable.outArrayPtr); - } - public void RunClassLclFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario)); @@ -385,26 +280,6 @@ namespace JIT.HardwareIntrinsics.Arm } } - public void RunClassLclFldScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario_Load)); - - var test = new LoadAndInsertTest__{TestName}(); - - fixed ({Op1VectorType}<{Op1BaseType}>* pFld1 = &test._fld1) - fixed ({Op1BaseType}* pFld3 = &test._fld3) - { - var result = {Isa}.{Method}( - {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)pFld1), - {ElementIndex}, - pFld3 - ); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(test._fld1, test._fld3, _dataTable.outArrayPtr); - } - } - public void RunClassFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassFldScenario)); @@ -419,24 +294,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(_fld1, _fld3, _dataTable.outArrayPtr); } - public void RunClassFldScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClassFldScenario_Load)); - - fixed ({Op1VectorType}<{Op1BaseType}>* pFld1 = &_fld1) - fixed ({Op1BaseType}* pFld3 = &_fld3) - { - var result = {Isa}.{Method}( - {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)pFld1), - {ElementIndex}, - pFld3 - ); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(_fld1, _fld3, _dataTable.outArrayPtr); - } - } - public void RunStructLclFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunStructLclFldScenario)); @@ -448,21 +305,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(test._fld1, test._fld3, _dataTable.outArrayPtr); } - public void RunStructLclFldScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunStructLclFldScenario_Load)); - - var test = TestStruct.Create(); - var result = {Isa}.{Method}( - {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(&test._fld1)), - {ElementIndex}, - &test._fld3 - ); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(test._fld1, test._fld3, _dataTable.outArrayPtr); - } - public void RunStructFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunStructFldScenario)); @@ -471,14 +313,6 @@ namespace JIT.HardwareIntrinsics.Arm test.RunStructFldScenario(this); } - public void RunStructFldScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunStructFldScenario_Load)); - - var test = TestStruct.Create(); - test.RunStructFldScenario_Load(this); - } - public void RunUnsupportedScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunUnsupportedScenario)); diff --git a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/StoreBinOpTest.template b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/StoreBinOpTest.template index e5825f5fd3a28f..4424da7daea2dc 100644 --- a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/StoreBinOpTest.template +++ b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/StoreBinOpTest.template @@ -39,65 +39,23 @@ namespace JIT.HardwareIntrinsics.Arm // Validates calling via reflection works, using Unsafe.Read test.RunReflectionScenario_UnsafeRead(); - if ({LoadIsa}.IsSupported) - { - // Validates calling via reflection works, using Load - test.RunReflectionScenario_Load(); - } - // Validates passing a static member works test.RunClsVarScenario(); - if ({LoadIsa}.IsSupported) - { - // Validates passing a static member works, using pinning and Load - test.RunClsVarScenario_Load(); - } - // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); - if ({LoadIsa}.IsSupported) - { - // Validates passing a local works, using Load - test.RunLclVarScenario_Load(); - } - // Validates passing the field of a local class works test.RunClassLclFldScenario(); - if ({LoadIsa}.IsSupported) - { - // Validates passing the field of a local class works, using pinning and Load - test.RunClassLclFldScenario_Load(); - } - // Validates passing an instance member of a class works test.RunClassFldScenario(); - if ({LoadIsa}.IsSupported) - { - // Validates passing an instance member of a class works, using pinning and Load - test.RunClassFldScenario_Load(); - } - // Validates passing the field of a local struct works test.RunStructLclFldScenario(); - if ({LoadIsa}.IsSupported) - { - // Validates passing the field of a local struct works, using pinning and Load - test.RunStructLclFldScenario_Load(); - } - // Validates passing an instance member of a struct works test.RunStructFldScenario(); - - if ({LoadIsa}.IsSupported) - { - // Validates passing an instance member of a struct works, using pinning and Load - test.RunStructFldScenario_Load(); - } } else { @@ -190,21 +148,6 @@ namespace JIT.HardwareIntrinsics.Arm testClass.ValidateResult(_fld1, _fld2, testClass._dataTable.outArrayPtr); } - - public void RunStructFldScenario_Load(StoreBinaryOpTest__{TestName} testClass) - { - fixed ({Op1VectorType}<{Op1BaseType}>* pFld1 = &_fld1) - fixed ({Op2VectorType}<{Op2BaseType}>* pFld2 = &_fld2) - { - {Isa}.{Method}( - ({RetBaseType}*)testClass._dataTable.outArrayPtr, - {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(pFld1)), - {LoadIsa}.Load{Op2VectorType}(({Op2BaseType}*)(pFld2)) - ); - - testClass.ValidateResult(_fld1, _fld2, testClass._dataTable.outArrayPtr); - } - } } private static readonly int LargestVectorSize = {LargestVectorSize}; @@ -288,20 +231,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(_dataTable.inArray1Ptr, _dataTable.inArray2Ptr, _dataTable.outArrayPtr); } - public void RunReflectionScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunReflectionScenario_Load)); - - typeof({Isa}).GetMethod(nameof({Isa}.{Method}), new Type[] { typeof({RetBaseType}*), typeof({Op1VectorType}<{Op1BaseType}>), typeof({Op2VectorType}<{Op2BaseType}>) }) - .Invoke(null, new object[] { - Pointer.Box(_dataTable.outArrayPtr, typeof({RetBaseType}*)), - {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(_dataTable.inArray1Ptr)), - {LoadIsa}.Load{Op2VectorType}(({Op2BaseType}*)(_dataTable.inArray2Ptr)) - }); - - ValidateResult(_dataTable.inArray1Ptr, _dataTable.inArray2Ptr, _dataTable.outArrayPtr); - } - public void RunClsVarScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario)); @@ -311,23 +240,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(_clsVar1, _clsVar2, _dataTable.outArrayPtr); } - public void RunClsVarScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario_Load)); - - fixed ({Op1VectorType}<{Op1BaseType}>* pClsVar1 = &_clsVar1) - fixed ({Op2VectorType}<{Op2BaseType}>* pClsVar2 = &_clsVar2) - { - {Isa}.{Method}( - ({Op1BaseType}*)_dataTable.outArrayPtr, - {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(pClsVar1)), - {LoadIsa}.Load{Op2VectorType}(({Op2BaseType}*)(pClsVar2)) - ); - - ValidateResult(_clsVar1, _clsVar2, _dataTable.outArrayPtr); - } - } - public void RunLclVarScenario_UnsafeRead() { TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_UnsafeRead)); @@ -339,17 +251,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(op1, op2, _dataTable.outArrayPtr); } - public void RunLclVarScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_Load)); - - var op1 = {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(_dataTable.inArray1Ptr)); - var op2 = {LoadIsa}.Load{Op2VectorType}(({Op2BaseType}*)(_dataTable.inArray2Ptr)); - {Isa}.{Method}(({RetBaseType}*)_dataTable.outArrayPtr, op1, op2); - - ValidateResult(op1, op2, _dataTable.outArrayPtr); - } - public void RunClassLclFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario)); @@ -360,25 +261,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(test._fld1, test._fld2, _dataTable.outArrayPtr); } - public void RunClassLclFldScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario_Load)); - - var test = new StoreBinaryOpTest__{TestName}(); - - fixed ({Op1VectorType}<{Op1BaseType}>* pFld1 = &test._fld1) - fixed ({Op2VectorType}<{Op2BaseType}>* pFld2 = &test._fld2) - { - {Isa}.{Method}( - ({RetBaseType}*)_dataTable.outArrayPtr, - {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(pFld1)), - {LoadIsa}.Load{Op2VectorType}(({Op2BaseType}*)(pFld2)) - ); - - ValidateResult(test._fld1, test._fld2, _dataTable.outArrayPtr); - } - } - public void RunClassFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassFldScenario)); @@ -388,23 +270,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(_fld1, _fld2, _dataTable.outArrayPtr); } - public void RunClassFldScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClassFldScenario_Load)); - - fixed ({Op1VectorType}<{Op1BaseType}>* pFld1 = &_fld1) - fixed ({Op2VectorType}<{Op2BaseType}>* pFld2 = &_fld2) - { - {Isa}.{Method}( - ({RetBaseType}*)_dataTable.outArrayPtr, - {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(pFld1)), - {LoadIsa}.Load{Op2VectorType}(({Op2BaseType}*)(pFld2)) - ); - - ValidateResult(_fld1, _fld2, _dataTable.outArrayPtr); - } - } - public void RunStructLclFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunStructLclFldScenario)); @@ -415,20 +280,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(test._fld1, test._fld2, _dataTable.outArrayPtr); } - public void RunStructLclFldScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunStructLclFldScenario_Load)); - - var test = TestStruct.Create(); - {Isa}.{Method}( - ({RetBaseType}*)_dataTable.outArrayPtr, - {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(&test._fld1)), - {LoadIsa}.Load{Op2VectorType}(({Op2BaseType}*)(&test._fld2)) - ); - - ValidateResult(test._fld1, test._fld2, _dataTable.outArrayPtr); - } - public void RunStructFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunStructFldScenario)); @@ -437,14 +288,6 @@ namespace JIT.HardwareIntrinsics.Arm test.RunStructFldScenario(this); } - public void RunStructFldScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunStructFldScenario_Load)); - - var test = TestStruct.Create(); - test.RunStructFldScenario_Load(this); - } - public void RunUnsupportedScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunUnsupportedScenario)); diff --git a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/StoreSelectedScalarTest.template b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/StoreSelectedScalarTest.template index 54db39df09c770..6b98a16192dcd3 100644 --- a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/StoreSelectedScalarTest.template +++ b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/StoreSelectedScalarTest.template @@ -39,65 +39,23 @@ namespace JIT.HardwareIntrinsics.Arm // Validates calling via reflection works, using Unsafe.Read test.RunReflectionScenario_UnsafeRead(); - if ({LoadIsa}.IsSupported) - { - // Validates calling via reflection works, using Load - test.RunReflectionScenario_Load(); - } - // Validates passing a static member works test.RunClsVarScenario(); - if ({LoadIsa}.IsSupported) - { - // Validates passing a static member works, using pinning and Load - test.RunClsVarScenario_Load(); - } - // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); - if ({LoadIsa}.IsSupported) - { - // Validates passing a local works, using Load - test.RunLclVarScenario_Load(); - } - // Validates passing the field of a local class works test.RunClassLclFldScenario(); - if ({LoadIsa}.IsSupported) - { - // Validates passing the field of a local class works, using pinning and Load - test.RunClassLclFldScenario_Load(); - } - // Validates passing an instance member of a class works test.RunClassFldScenario(); - if ({LoadIsa}.IsSupported) - { - // Validates passing an instance member of a class works, using pinning and Load - test.RunClassFldScenario_Load(); - } - // Validates passing the field of a local struct works test.RunStructLclFldScenario(); - if ({LoadIsa}.IsSupported) - { - // Validates passing the field of a local struct works, using pinning and Load - test.RunStructLclFldScenario_Load(); - } - // Validates passing an instance member of a struct works test.RunStructFldScenario(); - - if ({LoadIsa}.IsSupported) - { - // Validates passing an instance member of a struct works, using pinning and Load - test.RunStructFldScenario_Load(); - } } else { @@ -179,16 +137,6 @@ namespace JIT.HardwareIntrinsics.Arm testClass.ValidateResult(_fld1, testClass._dataTable.outArrayPtr); } - - public void RunStructFldScenario_Load(StoreSelectedScalarTest__{TestName} testClass) - { - fixed ({Op1VectorType}<{Op1BaseType}>* pFld1 = &_fld1) - { - {Isa}.{Method}(({RetBaseType}*)testClass._dataTable.outArrayPtr, {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(pFld1)), {ElementIndex}); - - testClass.ValidateResult(_fld1, testClass._dataTable.outArrayPtr); - } - } } private static readonly int LargestVectorSize = {LargestVectorSize}; @@ -257,19 +205,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(_dataTable.inArray1Ptr, _dataTable.outArrayPtr); } - public void RunReflectionScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunReflectionScenario_Load)); - - typeof({Isa}).GetMethod(nameof({Isa}.{Method}), new Type[] { typeof({RetBaseType}*), typeof({Op1VectorType}<{Op1BaseType}>), typeof(byte) }) - .Invoke(null, new object[] { - Pointer.Box(_dataTable.outArrayPtr, typeof({RetBaseType}*)), - {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(_dataTable.inArray1Ptr)), - ElementIndex }); - - ValidateResult(_dataTable.inArray1Ptr, _dataTable.outArrayPtr); - } - public void RunClsVarScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario)); @@ -279,18 +214,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(_clsVar1, _dataTable.outArrayPtr); } - public void RunClsVarScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario_Load)); - - fixed ({Op1VectorType}<{Op1BaseType}>* pClsVar1 = &_clsVar1) - { - {Isa}.{Method}(({Op1BaseType}*)_dataTable.outArrayPtr, {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(pClsVar1)), {ElementIndex}); - - ValidateResult(_clsVar1, _dataTable.outArrayPtr); - } - } - public void RunLclVarScenario_UnsafeRead() { TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_UnsafeRead)); @@ -301,16 +224,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(op1, _dataTable.outArrayPtr); } - public void RunLclVarScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_Load)); - - var op1 = {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(_dataTable.inArray1Ptr)); - {Isa}.{Method}(({RetBaseType}*)_dataTable.outArrayPtr, op1, {ElementIndex}); - - ValidateResult(op1, _dataTable.outArrayPtr); - } - public void RunClassLclFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario)); @@ -321,20 +234,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(test._fld1, _dataTable.outArrayPtr); } - public void RunClassLclFldScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario_Load)); - - var test = new StoreSelectedScalarTest__{TestName}(); - - fixed ({Op1VectorType}<{Op1BaseType}>* pFld1 = &test._fld1) - { - {Isa}.{Method}(({RetBaseType}*)_dataTable.outArrayPtr, {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(pFld1)), {ElementIndex}); - - ValidateResult(test._fld1, _dataTable.outArrayPtr); - } - } - public void RunClassFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassFldScenario)); @@ -344,18 +243,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(_fld1, _dataTable.outArrayPtr); } - public void RunClassFldScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClassFldScenario_Load)); - - fixed ({Op1VectorType}<{Op1BaseType}>* pFld1 = &_fld1) - { - {Isa}.{Method}(({RetBaseType}*)_dataTable.outArrayPtr, {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(pFld1)), {ElementIndex}); - - ValidateResult(_fld1, _dataTable.outArrayPtr); - } - } - public void RunStructLclFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunStructLclFldScenario)); @@ -366,16 +253,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(test._fld1, _dataTable.outArrayPtr); } - public void RunStructLclFldScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunStructLclFldScenario_Load)); - - var test = TestStruct.Create(); - {Isa}.{Method}(({RetBaseType}*)_dataTable.outArrayPtr, {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(&test._fld1)), {ElementIndex}); - - ValidateResult(test._fld1, _dataTable.outArrayPtr); - } - public void RunStructFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunStructFldScenario)); @@ -384,14 +261,6 @@ namespace JIT.HardwareIntrinsics.Arm test.RunStructFldScenario(this); } - public void RunStructFldScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunStructFldScenario_Load)); - - var test = TestStruct.Create(); - test.RunStructFldScenario_Load(this); - } - public void RunUnsupportedScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunUnsupportedScenario)); diff --git a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/StoreUnOpTest.template b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/StoreUnOpTest.template index 7653b84a10af10..0cbb6271f713f6 100644 --- a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/StoreUnOpTest.template +++ b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/StoreUnOpTest.template @@ -39,65 +39,23 @@ namespace JIT.HardwareIntrinsics.Arm // Validates calling via reflection works, using Unsafe.Read test.RunReflectionScenario_UnsafeRead(); - if ({LoadIsa}.IsSupported) - { - // Validates calling via reflection works, using Load - test.RunReflectionScenario_Load(); - } - // Validates passing a static member works test.RunClsVarScenario(); - if ({LoadIsa}.IsSupported) - { - // Validates passing a static member works, using pinning and Load - test.RunClsVarScenario_Load(); - } - // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); - if ({LoadIsa}.IsSupported) - { - // Validates passing a local works, using Load - test.RunLclVarScenario_Load(); - } - // Validates passing the field of a local class works test.RunClassLclFldScenario(); - if ({LoadIsa}.IsSupported) - { - // Validates passing the field of a local class works, using pinning and Load - test.RunClassLclFldScenario_Load(); - } - // Validates passing an instance member of a class works test.RunClassFldScenario(); - if ({LoadIsa}.IsSupported) - { - // Validates passing an instance member of a class works, using pinning and Load - test.RunClassFldScenario_Load(); - } - // Validates passing the field of a local struct works test.RunStructLclFldScenario(); - if ({LoadIsa}.IsSupported) - { - // Validates passing the field of a local struct works, using pinning and Load - test.RunStructLclFldScenario_Load(); - } - // Validates passing an instance member of a struct works test.RunStructFldScenario(); - - if ({LoadIsa}.IsSupported) - { - // Validates passing an instance member of a struct works, using pinning and Load - test.RunStructFldScenario_Load(); - } } else { @@ -179,16 +137,6 @@ namespace JIT.HardwareIntrinsics.Arm testClass.ValidateResult(_fld1, testClass._dataTable.outArrayPtr); } - - public void RunStructFldScenario_Load(StoreUnaryOpTest__{TestName} testClass) - { - fixed ({Op1VectorType}<{Op1BaseType}>* pFld1 = &_fld1) - { - {Isa}.{Method}(({RetBaseType}*)testClass._dataTable.outArrayPtr, {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(pFld1))); - - testClass.ValidateResult(_fld1, testClass._dataTable.outArrayPtr); - } - } } private static readonly int LargestVectorSize = {LargestVectorSize}; @@ -255,19 +203,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(_dataTable.inArray1Ptr, _dataTable.outArrayPtr); } - public void RunReflectionScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunReflectionScenario_Load)); - - typeof({Isa}).GetMethod(nameof({Isa}.{Method}), new Type[] { typeof({RetBaseType}*), typeof({Op1VectorType}<{Op1BaseType}>) }) - .Invoke(null, new object[] { - Pointer.Box(_dataTable.outArrayPtr, typeof({RetBaseType}*)), - {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(_dataTable.inArray1Ptr)) - }); - - ValidateResult(_dataTable.inArray1Ptr, _dataTable.outArrayPtr); - } - public void RunClsVarScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario)); @@ -277,18 +212,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(_clsVar1, _dataTable.outArrayPtr); } - public void RunClsVarScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario_Load)); - - fixed ({Op1VectorType}<{Op1BaseType}>* pClsVar1 = &_clsVar1) - { - {Isa}.{Method}(({Op1BaseType}*)_dataTable.outArrayPtr, {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(pClsVar1))); - - ValidateResult(_clsVar1, _dataTable.outArrayPtr); - } - } - public void RunLclVarScenario_UnsafeRead() { TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_UnsafeRead)); @@ -299,16 +222,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(op1, _dataTable.outArrayPtr); } - public void RunLclVarScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_Load)); - - var op1 = {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(_dataTable.inArray1Ptr)); - {Isa}.{Method}(({RetBaseType}*)_dataTable.outArrayPtr, op1); - - ValidateResult(op1, _dataTable.outArrayPtr); - } - public void RunClassLclFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario)); @@ -319,20 +232,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(test._fld1, _dataTable.outArrayPtr); } - public void RunClassLclFldScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario_Load)); - - var test = new StoreUnaryOpTest__{TestName}(); - - fixed ({Op1VectorType}<{Op1BaseType}>* pFld1 = &test._fld1) - { - {Isa}.{Method}(({RetBaseType}*)_dataTable.outArrayPtr, {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(pFld1))); - - ValidateResult(test._fld1, _dataTable.outArrayPtr); - } - } - public void RunClassFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassFldScenario)); @@ -342,18 +241,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(_fld1, _dataTable.outArrayPtr); } - public void RunClassFldScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClassFldScenario_Load)); - - fixed ({Op1VectorType}<{Op1BaseType}>* pFld1 = &_fld1) - { - {Isa}.{Method}(({RetBaseType}*)_dataTable.outArrayPtr, {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(pFld1))); - - ValidateResult(_fld1, _dataTable.outArrayPtr); - } - } - public void RunStructLclFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunStructLclFldScenario)); @@ -364,16 +251,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(test._fld1, _dataTable.outArrayPtr); } - public void RunStructLclFldScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunStructLclFldScenario_Load)); - - var test = TestStruct.Create(); - {Isa}.{Method}(({RetBaseType}*)_dataTable.outArrayPtr, {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(&test._fld1))); - - ValidateResult(test._fld1, _dataTable.outArrayPtr); - } - public void RunStructFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunStructFldScenario)); @@ -382,14 +259,6 @@ namespace JIT.HardwareIntrinsics.Arm test.RunStructFldScenario(this); } - public void RunStructFldScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunStructFldScenario_Load)); - - var test = TestStruct.Create(); - test.RunStructFldScenario_Load(this); - } - public void RunUnsupportedScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunUnsupportedScenario)); diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Shared/AesBinOpTest.template b/src/tests/JIT/HardwareIntrinsics/X86/Shared/AesBinOpTest.template index 34428e11526c0b..d971c437783525 100644 --- a/src/tests/JIT/HardwareIntrinsics/X86/Shared/AesBinOpTest.template +++ b/src/tests/JIT/HardwareIntrinsics/X86/Shared/AesBinOpTest.template @@ -41,71 +41,23 @@ namespace JIT.HardwareIntrinsics.X86 // Validates calling via reflection works, using Unsafe.Read test.RunReflectionScenario_UnsafeRead(); - if ({LoadIsa}.IsSupported) - { - // Validates calling via reflection works, using Load - test.RunReflectionScenario_Load(); - - // Validates calling via reflection works, using LoadAligned - test.RunReflectionScenario_LoadAligned(); - } - // Validates passing a static member works test.RunClsVarScenario(); - if ({LoadIsa}.IsSupported) - { - // Validates passing a static member works, using pinning and Load - test.RunClsVarScenario_Load(); - } - // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); - if ({LoadIsa}.IsSupported) - { - // Validates passing a local works, using Load - test.RunLclVarScenario_Load(); - - // Validates passing a local works, using LoadAligned - test.RunLclVarScenario_LoadAligned(); - } - // Validates passing the field of a local class works test.RunClassLclFldScenario(); - if ({LoadIsa}.IsSupported) - { - // Validates passing the field of a local class works, using pinning and Load - test.RunClassLclFldScenario_Load(); - } - // Validates passing an instance member of a class works test.RunClassFldScenario(); - if ({LoadIsa}.IsSupported) - { - // Validates passing an instance member of a class works, using pinning and Load - test.RunClassFldScenario_Load(); - } - // Validates passing the field of a local struct works test.RunStructLclFldScenario(); - if ({LoadIsa}.IsSupported) - { - // Validates passing the field of a local struct works, using pinning and Load - test.RunStructLclFldScenario_Load(); - } - // Validates passing an instance member of a struct works test.RunStructFldScenario(); - - if ({LoadIsa}.IsSupported) - { - // Validates passing an instance member of a struct works, using pinning and Load - test.RunStructFldScenario_Load(); - } } else { @@ -145,21 +97,6 @@ namespace JIT.HardwareIntrinsics.X86 Unsafe.Write(testClass._dataTable.outArrayPtr, result); testClass.ValidateResult(testClass._dataTable.outArrayPtr); } - - public void RunStructFldScenario_Load(AesBinaryOpTest__{Method}{RetBaseType} testClass) - { - fixed ({Op1VectorType}<{Op1BaseType}>* pFld1 = &_fld1) - fixed ({Op2VectorType}<{Op2BaseType}>* pFld2 = &_fld2) - { - var result = {Isa}.{Method}( - {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(pFld1)), - {LoadIsa}.Load{Op2VectorType}(({Op2BaseType}*)(pFld2)) - ); - - Unsafe.Write(testClass._dataTable.outArrayPtr, result); - testClass.ValidateResult(testClass._dataTable.outArrayPtr); - } - } } private static readonly int LargestVectorSize = {LargestVectorSize}; @@ -255,34 +192,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(_dataTable.outArrayPtr); } - public void RunReflectionScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunReflectionScenario_Load)); - - var result = typeof({Isa}).GetMethod(nameof({Isa}.{Method}), new Type[] { typeof({Op1VectorType}<{Op1BaseType}>), typeof({Op2VectorType}<{Op2BaseType}>) }) - .Invoke(null, new object[] { - {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(_dataTable.inArray1Ptr)), - {LoadIsa}.Load{Op2VectorType}(({Op2BaseType}*)(_dataTable.inArray2Ptr)) - }); - - Unsafe.Write(_dataTable.outArrayPtr, ({RetVectorType}<{RetBaseType}>)(result)); - ValidateResult(_dataTable.outArrayPtr); - } - - public void RunReflectionScenario_LoadAligned() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunReflectionScenario_LoadAligned)); - - var result = typeof({Isa}).GetMethod(nameof({Isa}.{Method}), new Type[] { typeof({Op1VectorType}<{Op1BaseType}>), typeof({Op2VectorType}<{Op2BaseType}>) }) - .Invoke(null, new object[] { - {LoadIsa}.LoadAligned{Op1VectorType}(({Op1BaseType}*)(_dataTable.inArray1Ptr)), - {LoadIsa}.LoadAligned{Op2VectorType}(({Op2BaseType}*)(_dataTable.inArray2Ptr)) - }); - - Unsafe.Write(_dataTable.outArrayPtr, ({RetVectorType}<{RetBaseType}>)(result)); - ValidateResult(_dataTable.outArrayPtr); - } - public void RunClsVarScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario)); @@ -296,23 +205,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(_dataTable.outArrayPtr); } - public void RunClsVarScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario_Load)); - - fixed ({Op1VectorType}<{Op1BaseType}>* pClsVar1 = &_clsVar1) - fixed ({Op2VectorType}<{Op2BaseType}>* pClsVar2 = &_clsVar2) - { - var result = {Isa}.{Method}( - {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(pClsVar1)), - {LoadIsa}.Load{Op2VectorType}(({Op2BaseType}*)(pClsVar2)) - ); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(_dataTable.outArrayPtr); - } - } - public void RunLclVarScenario_UnsafeRead() { TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_UnsafeRead)); @@ -325,30 +217,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(_dataTable.outArrayPtr); } - public void RunLclVarScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_Load)); - - var left = {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(_dataTable.inArray1Ptr)); - var right = {LoadIsa}.Load{Op2VectorType}(({Op2BaseType}*)(_dataTable.inArray2Ptr)); - var result = {Isa}.{Method}(left, right); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(_dataTable.outArrayPtr); - } - - public void RunLclVarScenario_LoadAligned() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_LoadAligned)); - - var left = {LoadIsa}.LoadAligned{Op1VectorType}(({Op1BaseType}*)(_dataTable.inArray1Ptr)); - var right = {LoadIsa}.LoadAligned{Op2VectorType}(({Op2BaseType}*)(_dataTable.inArray2Ptr)); - var result = {Isa}.{Method}(left, right); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(_dataTable.outArrayPtr); - } - public void RunClassLclFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario)); @@ -360,25 +228,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(_dataTable.outArrayPtr); } - public void RunClassLclFldScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario_Load)); - - var test = new AesBinaryOpTest__{Method}{RetBaseType}(); - - fixed ({Op1VectorType}<{Op1BaseType}>* pFld1 = &test._fld1) - fixed ({Op2VectorType}<{Op2BaseType}>* pFld2 = &test._fld2) - { - var result = {Isa}.{Method}( - {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(pFld1)), - {LoadIsa}.Load{Op2VectorType}(({Op2BaseType}*)(pFld2)) - ); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(_dataTable.outArrayPtr); - } - } - public void RunClassFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassFldScenario)); @@ -389,23 +238,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(_dataTable.outArrayPtr); } - public void RunClassFldScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClassFldScenario_Load)); - - fixed ({Op1VectorType}<{Op1BaseType}>* pFld1 = &_fld1) - fixed ({Op2VectorType}<{Op2BaseType}>* pFld2 = &_fld2) - { - var result = {Isa}.{Method}( - {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(pFld1)), - {LoadIsa}.Load{Op2VectorType}(({Op2BaseType}*)(pFld2)) - ); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(_dataTable.outArrayPtr); - } - } - public void RunStructLclFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunStructLclFldScenario)); @@ -417,20 +249,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(_dataTable.outArrayPtr); } - public void RunStructLclFldScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunStructLclFldScenario_Load)); - - var test = TestStruct.Create(); - var result = {Isa}.{Method}( - {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(&test._fld1)), - {LoadIsa}.Load{Op2VectorType}(({Op2BaseType}*)(&test._fld2)) - ); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(_dataTable.outArrayPtr); - } - public void RunStructFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunStructFldScenario)); @@ -439,14 +257,6 @@ namespace JIT.HardwareIntrinsics.X86 test.RunStructFldScenario(this); } - public void RunStructFldScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunStructFldScenario_Load)); - - var test = TestStruct.Create(); - test.RunStructFldScenario_Load(this); - } - public void RunUnsupportedScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunUnsupportedScenario)); diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Shared/AesImmOpTest.template b/src/tests/JIT/HardwareIntrinsics/X86/Shared/AesImmOpTest.template index 622c656aad42ad..985cd288083d5f 100644 --- a/src/tests/JIT/HardwareIntrinsics/X86/Shared/AesImmOpTest.template +++ b/src/tests/JIT/HardwareIntrinsics/X86/Shared/AesImmOpTest.template @@ -41,71 +41,23 @@ namespace JIT.HardwareIntrinsics.X86 // Validates calling via reflection works, using Unsafe.Read test.RunReflectionScenario_UnsafeRead(); - if ({LoadIsa}.IsSupported) - { - // Validates calling via reflection works, using Load - test.RunReflectionScenario_Load(); - - // Validates calling via reflection works, using LoadAligned - test.RunReflectionScenario_LoadAligned(); - } - // Validates passing a static member works test.RunClsVarScenario(); - if ({LoadIsa}.IsSupported) - { - // Validates passing a static member works, using pinning and Load - test.RunClsVarScenario_Load(); - } - // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); - if ({LoadIsa}.IsSupported) - { - // Validates passing a local works, using Load - test.RunLclVarScenario_Load(); - - // Validates passing a local works, using LoadAligned - test.RunLclVarScenario_LoadAligned(); - } - // Validates passing the field of a local class works test.RunClassLclFldScenario(); - if ({LoadIsa}.IsSupported) - { - // Validates passing the field of a local class works, using pinning and Load - test.RunClassLclFldScenario_Load(); - } - // Validates passing an instance member of a class works test.RunClassFldScenario(); - if ({LoadIsa}.IsSupported) - { - // Validates passing an instance member of a class works, using pinning and Load - test.RunClassFldScenario_Load(); - } - // Validates passing the field of a local struct works test.RunStructLclFldScenario(); - if ({LoadIsa}.IsSupported) - { - // Validates passing the field of a local struct works, using pinning and Load - test.RunStructLclFldScenario_Load(); - } - // Validates passing an instance member of a struct works test.RunStructFldScenario(); - - if ({LoadIsa}.IsSupported) - { - // Validates passing an instance member of a struct works, using pinning and Load - test.RunStructFldScenario_Load(); - } } else { @@ -142,20 +94,6 @@ namespace JIT.HardwareIntrinsics.X86 Unsafe.Write(testClass._dataTable.outArrayPtr, result); testClass.ValidateResult(testClass._dataTable.outArrayPtr); } - - public void RunStructFldScenario_Load(AesImmOpTest__{Method}{RetBaseType}{Imm} testClass) - { - fixed ({Op1VectorType}<{Op1BaseType}>* pFld = &_fld) - { - var result = {Isa}.{Method}( - {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(pFld)), - {Imm} - ); - - Unsafe.Write(testClass._dataTable.outArrayPtr, result); - testClass.ValidateResult(testClass._dataTable.outArrayPtr); - } - } } private static readonly int LargestVectorSize = {LargestVectorSize}; @@ -244,34 +182,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(_dataTable.outArrayPtr); } - public void RunReflectionScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunReflectionScenario_Load)); - - var result = typeof({Isa}).GetMethod(nameof({Isa}.{Method}), new Type[] { typeof({Op1VectorType}<{Op1BaseType}>), typeof(byte) }) - .Invoke(null, new object[] { - {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(_dataTable.inArrayPtr)), - (byte){Imm} - }); - - Unsafe.Write(_dataTable.outArrayPtr, ({RetVectorType}<{RetBaseType}>)(result)); - ValidateResult(_dataTable.outArrayPtr); - } - - public void RunReflectionScenario_LoadAligned() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunReflectionScenario_LoadAligned)); - - var result = typeof({Isa}).GetMethod(nameof({Isa}.{Method}), new Type[] { typeof({Op1VectorType}<{Op1BaseType}>), typeof(byte) }) - .Invoke(null, new object[] { - {LoadIsa}.LoadAligned{Op1VectorType}(({Op1BaseType}*)(_dataTable.inArrayPtr)), - (byte){Imm} - }); - - Unsafe.Write(_dataTable.outArrayPtr, ({RetVectorType}<{RetBaseType}>)(result)); - ValidateResult(_dataTable.outArrayPtr); - } - public void RunClsVarScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario)); @@ -285,22 +195,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(_dataTable.outArrayPtr); } - public void RunClsVarScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario_Load)); - - fixed ({Op1VectorType}<{Op1BaseType}>* pClsVar = &_clsVar) - { - var result = {Isa}.{Method}( - {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(pClsVar)), - {Imm} - ); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(_dataTable.outArrayPtr); - } - } - public void RunLclVarScenario_UnsafeRead() { TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_UnsafeRead)); @@ -312,28 +206,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(_dataTable.outArrayPtr); } - public void RunLclVarScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_Load)); - - var firstOp = {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(_dataTable.inArrayPtr)); - var result = {Isa}.{Method}(firstOp, {Imm}); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(_dataTable.outArrayPtr); - } - - public void RunLclVarScenario_LoadAligned() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_LoadAligned)); - - var firstOp = {LoadIsa}.LoadAligned{Op1VectorType}(({Op1BaseType}*)(_dataTable.inArrayPtr)); - var result = {Isa}.{Method}(firstOp, {Imm}); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(_dataTable.outArrayPtr); - } - public void RunClassLclFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario)); @@ -345,24 +217,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(_dataTable.outArrayPtr); } - public void RunClassLclFldScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario_Load)); - - var test = new AesImmOpTest__{Method}{RetBaseType}{Imm}(); - - fixed ({Op1VectorType}<{Op1BaseType}>* pFld = &test._fld) - { - var result = {Isa}.{Method}( - {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(pFld)), - {Imm} - ); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(_dataTable.outArrayPtr); - } - } - public void RunClassFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassFldScenario)); @@ -373,22 +227,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(_dataTable.outArrayPtr); } - public void RunClassFldScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClassFldScenario_Load)); - - fixed ({Op1VectorType}<{Op1BaseType}>* pFld = &_fld) - { - var result = {Isa}.{Method}( - {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(pFld)), - {Imm} - ); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(_dataTable.outArrayPtr); - } - } - public void RunStructLclFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunStructLclFldScenario)); @@ -400,20 +238,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(_dataTable.outArrayPtr); } - public void RunStructLclFldScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunStructLclFldScenario_Load)); - - var test = TestStruct.Create(); - var result = {Isa}.{Method}( - {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(&test._fld)), - {Imm} - ); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(_dataTable.outArrayPtr); - } - public void RunStructFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunStructFldScenario)); @@ -422,14 +246,6 @@ namespace JIT.HardwareIntrinsics.X86 test.RunStructFldScenario(this); } - public void RunStructFldScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunStructFldScenario_Load)); - - var test = TestStruct.Create(); - test.RunStructFldScenario_Load(this); - } - public void RunUnsupportedScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunUnsupportedScenario)); diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Shared/AesUnOpTest.template b/src/tests/JIT/HardwareIntrinsics/X86/Shared/AesUnOpTest.template index 99efc81973b095..38761b77b340d4 100644 --- a/src/tests/JIT/HardwareIntrinsics/X86/Shared/AesUnOpTest.template +++ b/src/tests/JIT/HardwareIntrinsics/X86/Shared/AesUnOpTest.template @@ -41,71 +41,23 @@ namespace JIT.HardwareIntrinsics.X86 // Validates calling via reflection works, using Unsafe.Read test.RunReflectionScenario_UnsafeRead(); - if ({LoadIsa}.IsSupported) - { - // Validates calling via reflection works, using Load - test.RunReflectionScenario_Load(); - - // Validates calling via reflection works, using LoadAligned - test.RunReflectionScenario_LoadAligned(); - } - // Validates passing a static member works test.RunClsVarScenario(); - if ({LoadIsa}.IsSupported) - { - // Validates passing a static member works, using pinning and Load - test.RunClsVarScenario_Load(); - } - // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); - if ({LoadIsa}.IsSupported) - { - // Validates passing a local works, using Load - test.RunLclVarScenario_Load(); - - // Validates passing a local works, using LoadAligned - test.RunLclVarScenario_LoadAligned(); - } - // Validates passing the field of a local class works test.RunClassLclFldScenario(); - if ({LoadIsa}.IsSupported) - { - // Validates passing the field of a local class works, using pinning and Load - test.RunClassLclFldScenario_Load(); - } - // Validates passing an instance member of a class works test.RunClassFldScenario(); - if ({LoadIsa}.IsSupported) - { - // Validates passing an instance member of a class works, using pinning and Load - test.RunClassFldScenario_Load(); - } - // Validates passing the field of a local struct works test.RunStructLclFldScenario(); - if ({LoadIsa}.IsSupported) - { - // Validates passing the field of a local struct works, using pinning and Load - test.RunStructLclFldScenario_Load(); - } - // Validates passing an instance member of a struct works test.RunStructFldScenario(); - - if ({LoadIsa}.IsSupported) - { - // Validates passing an instance member of a struct works, using pinning and Load - test.RunStructFldScenario_Load(); - } } else { @@ -142,19 +94,6 @@ namespace JIT.HardwareIntrinsics.X86 Unsafe.Write(testClass._dataTable.outArrayPtr, result); testClass.ValidateResult(testClass._dataTable.outArrayPtr); } - - public void RunStructFldScenario_Load(AesUnaryOpTest__{Method}{RetBaseType} testClass) - { - fixed ({Op1VectorType}<{Op1BaseType}>* pFld = &_fld) - { - var result = {Isa}.{Method}( - {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(pFld)) - ); - - Unsafe.Write(testClass._dataTable.outArrayPtr, result); - testClass.ValidateResult(testClass._dataTable.outArrayPtr); - } - } } private static readonly int LargestVectorSize = {LargestVectorSize}; @@ -239,32 +178,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(_dataTable.outArrayPtr); } - public void RunReflectionScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunReflectionScenario_Load)); - - var result = typeof({Isa}).GetMethod(nameof({Isa}.{Method}), new Type[] { typeof({Op1VectorType}<{Op1BaseType}>) }) - .Invoke(null, new object[] { - {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(_dataTable.inArrayPtr)) - }); - - Unsafe.Write(_dataTable.outArrayPtr, ({RetVectorType}<{RetBaseType}>)(result)); - ValidateResult(_dataTable.outArrayPtr); - } - - public void RunReflectionScenario_LoadAligned() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunReflectionScenario_LoadAligned)); - - var result = typeof({Isa}).GetMethod(nameof({Isa}.{Method}), new Type[] { typeof({Op1VectorType}<{Op1BaseType}>) }) - .Invoke(null, new object[] { - {LoadIsa}.LoadAligned{Op1VectorType}(({Op1BaseType}*)(_dataTable.inArrayPtr)) - }); - - Unsafe.Write(_dataTable.outArrayPtr, ({RetVectorType}<{RetBaseType}>)(result)); - ValidateResult(_dataTable.outArrayPtr); - } - public void RunClsVarScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario)); @@ -277,21 +190,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(_dataTable.outArrayPtr); } - public void RunClsVarScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario_Load)); - - fixed ({Op1VectorType}<{Op1BaseType}>* pClsVar = &_clsVar) - { - var result = {Isa}.{Method}( - {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(pClsVar)) - ); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(_dataTable.outArrayPtr); - } - } - public void RunLclVarScenario_UnsafeRead() { TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_UnsafeRead)); @@ -303,28 +201,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(_dataTable.outArrayPtr); } - public void RunLclVarScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_Load)); - - var firstOp = {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(_dataTable.inArrayPtr)); - var result = {Isa}.{Method}(firstOp); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(_dataTable.outArrayPtr); - } - - public void RunLclVarScenario_LoadAligned() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_LoadAligned)); - - var firstOp = {LoadIsa}.LoadAligned{Op1VectorType}(({Op1BaseType}*)(_dataTable.inArrayPtr)); - var result = {Isa}.{Method}(firstOp); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(_dataTable.outArrayPtr); - } - public void RunClassLclFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario)); @@ -336,23 +212,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(_dataTable.outArrayPtr); } - public void RunClassLclFldScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario_Load)); - - var test = new AesUnaryOpTest__{Method}{RetBaseType}(); - - fixed ({Op1VectorType}<{Op1BaseType}>* pFld = &test._fld) - { - var result = {Isa}.{Method}( - {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(pFld)) - ); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(_dataTable.outArrayPtr); - } - } - public void RunClassFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassFldScenario)); @@ -363,21 +222,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(_dataTable.outArrayPtr); } - public void RunClassFldScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClassFldScenario_Load)); - - fixed ({Op1VectorType}<{Op1BaseType}>* pFld = &_fld) - { - var result = {Isa}.{Method}( - {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(pFld)) - ); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(_dataTable.outArrayPtr); - } - } - public void RunStructLclFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunStructLclFldScenario)); @@ -389,19 +233,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(_dataTable.outArrayPtr); } - public void RunStructLclFldScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunStructLclFldScenario_Load)); - - var test = TestStruct.Create(); - var result = {Isa}.{Method}( - {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(&test._fld)) - ); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(_dataTable.outArrayPtr); - } - public void RunStructFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunStructFldScenario)); @@ -410,14 +241,6 @@ namespace JIT.HardwareIntrinsics.X86 test.RunStructFldScenario(this); } - public void RunStructFldScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunStructFldScenario_Load)); - - var test = TestStruct.Create(); - test.RunStructFldScenario_Load(this); - } - public void RunUnsupportedScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunUnsupportedScenario)); diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Shared/ExtractScalarTest.template b/src/tests/JIT/HardwareIntrinsics/X86/Shared/ExtractScalarTest.template index 7411de8c93f3db..bff882cb4df295 100644 --- a/src/tests/JIT/HardwareIntrinsics/X86/Shared/ExtractScalarTest.template +++ b/src/tests/JIT/HardwareIntrinsics/X86/Shared/ExtractScalarTest.template @@ -41,30 +41,12 @@ namespace JIT.HardwareIntrinsics.X86 // Validates calling via reflection works, using Unsafe.Read test.RunReflectionScenario_UnsafeRead(); - if ({LoadIsa}.IsSupported) - { - // Validates calling via reflection works, using Load - test.RunReflectionScenario_Load(); - - // Validates calling via reflection works, using LoadAligned - test.RunReflectionScenario_LoadAligned(); - } - // Validates passing a static member works test.RunClsVarScenario(); // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); - if ({LoadIsa}.IsSupported) - { - // Validates passing a local works, using Load - test.RunLclVarScenario_Load(); - - // Validates passing a local works, using LoadAligned - test.RunLclVarScenario_LoadAligned(); - } - // Validates passing the field of a local class works test.RunClassLclFldScenario(); @@ -202,34 +184,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(_dataTable.inArrayPtr, _dataTable.outArrayPtr); } - public void RunReflectionScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunReflectionScenario_Load)); - - var result = typeof({Isa}).GetMethod(nameof({Isa}.{Method}), new Type[] { typeof({Op1VectorType}<{Op1BaseType}>), typeof(byte) }) - .Invoke(null, new object[] { - {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(_dataTable.inArrayPtr)), - (byte){Imm} - }); - - Unsafe.Write(_dataTable.outArrayPtr, ({RetBaseType})(result)); - ValidateResult(_dataTable.inArrayPtr, _dataTable.outArrayPtr); - } - - public void RunReflectionScenario_LoadAligned() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunReflectionScenario_LoadAligned)); - - var result = typeof({Isa}).GetMethod(nameof({Isa}.{Method}), new Type[] { typeof({Op1VectorType}<{Op1BaseType}>), typeof(byte) }) - .Invoke(null, new object[] { - {LoadIsa}.LoadAligned{Op1VectorType}(({Op1BaseType}*)(_dataTable.inArrayPtr)), - (byte){Imm} - }); - - Unsafe.Write(_dataTable.outArrayPtr, ({RetBaseType})(result)); - ValidateResult(_dataTable.inArrayPtr, _dataTable.outArrayPtr); - } - public void RunClsVarScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario)); @@ -254,28 +208,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(firstOp, _dataTable.outArrayPtr); } - public void RunLclVarScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_Load)); - - var firstOp = {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(_dataTable.inArrayPtr)); - var result = {Isa}.{Method}(firstOp, {Imm}); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(firstOp, _dataTable.outArrayPtr); - } - - public void RunLclVarScenario_LoadAligned() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_LoadAligned)); - - var firstOp = {LoadIsa}.LoadAligned{Op1VectorType}(({Op1BaseType}*)(_dataTable.inArrayPtr)); - var result = {Isa}.{Method}(firstOp, {Imm}); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(firstOp, _dataTable.outArrayPtr); - } - public void RunClassLclFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario)); diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Shared/ExtractVector128Test.template b/src/tests/JIT/HardwareIntrinsics/X86/Shared/ExtractVector128Test.template index b21b572f592870..142c8c9d5f5d24 100644 --- a/src/tests/JIT/HardwareIntrinsics/X86/Shared/ExtractVector128Test.template +++ b/src/tests/JIT/HardwareIntrinsics/X86/Shared/ExtractVector128Test.template @@ -41,30 +41,12 @@ namespace JIT.HardwareIntrinsics.X86 // Validates calling via reflection works, using Unsafe.Read test.RunReflectionScenario_UnsafeRead(); - if ({LoadIsa}.IsSupported) - { - // Validates calling via reflection works, using Load - test.RunReflectionScenario_Load(); - - // Validates calling via reflection works, using LoadAligned - test.RunReflectionScenario_LoadAligned(); - } - // Validates passing a static member works test.RunClsVarScenario(); // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); - if ({LoadIsa}.IsSupported) - { - // Validates passing a local works, using Load - test.RunLclVarScenario_Load(); - - // Validates passing a local works, using LoadAligned - test.RunLclVarScenario_LoadAligned(); - } - // Validates passing the field of a local class works test.RunClassLclFldScenario(); @@ -202,34 +184,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(_dataTable.inArrayPtr, _dataTable.outArrayPtr); } - public void RunReflectionScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunReflectionScenario_Load)); - - var result = typeof({Isa}).GetMethod(nameof({Isa}.{Method}), new Type[] { typeof({Op1VectorType}<{Op1BaseType}>), typeof(byte) }) - .Invoke(null, new object[] { - {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(_dataTable.inArrayPtr)), - (byte){Imm} - }); - - Unsafe.Write(_dataTable.outArrayPtr, ({RetVectorType}<{RetBaseType}>)(result)); - ValidateResult(_dataTable.inArrayPtr, _dataTable.outArrayPtr); - } - - public void RunReflectionScenario_LoadAligned() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunReflectionScenario_LoadAligned)); - - var result = typeof({Isa}).GetMethod(nameof({Isa}.{Method}), new Type[] { typeof({Op1VectorType}<{Op1BaseType}>), typeof(byte) }) - .Invoke(null, new object[] { - {LoadIsa}.LoadAligned{Op1VectorType}(({Op1BaseType}*)(_dataTable.inArrayPtr)), - (byte){Imm} - }); - - Unsafe.Write(_dataTable.outArrayPtr, ({RetVectorType}<{RetBaseType}>)(result)); - ValidateResult(_dataTable.inArrayPtr, _dataTable.outArrayPtr); - } - public void RunClsVarScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario)); @@ -254,28 +208,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(firstOp, _dataTable.outArrayPtr); } - public void RunLclVarScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_Load)); - - var firstOp = {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(_dataTable.inArrayPtr)); - var result = {Isa}.{Method}(firstOp, {Imm}); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(firstOp, _dataTable.outArrayPtr); - } - - public void RunLclVarScenario_LoadAligned() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_LoadAligned)); - - var firstOp = {LoadIsa}.LoadAligned{Op1VectorType}(({Op1BaseType}*)(_dataTable.inArrayPtr)); - var result = {Isa}.{Method}(firstOp, {Imm}); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(firstOp, _dataTable.outArrayPtr); - } - public void RunClassLclFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario)); diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Shared/GenericUnOpTest.template b/src/tests/JIT/HardwareIntrinsics/X86/Shared/GenericUnOpTest.template index 1684db98b9a6d1..0eae20ea27a053 100644 --- a/src/tests/JIT/HardwareIntrinsics/X86/Shared/GenericUnOpTest.template +++ b/src/tests/JIT/HardwareIntrinsics/X86/Shared/GenericUnOpTest.template @@ -41,30 +41,12 @@ namespace JIT.HardwareIntrinsics.X86 // Validates calling via reflection works, using Unsafe.Read test.RunReflectionScenario_UnsafeRead(); - if ({LoadIsa}.IsSupported) - { - // Validates calling via reflection works, using Load - test.RunReflectionScenario_Load(); - - // Validates calling via reflection works, using LoadAligned - test.RunReflectionScenario_LoadAligned(); - } - // Validates passing a static member works test.RunClsVarScenario(); // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); - if ({LoadIsa}.IsSupported) - { - // Validates passing a local works, using Load - test.RunLclVarScenario_Load(); - - // Validates passing a local works, using LoadAligned - test.RunLclVarScenario_LoadAligned(); - } - // Validates passing the field of a local class works test.RunClassLclFldScenario(); @@ -199,34 +181,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(_dataTable.inArrayPtr, _dataTable.outArrayPtr); } - public void RunReflectionScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunReflectionScenario_Load)); - - var result = typeof({Isa}).GetMethod(nameof({Isa}.{Method})) - .MakeGenericMethod( new Type[] { typeof({Op1BaseType}) }) - .Invoke(null, new object[] { - {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(_dataTable.inArrayPtr)) - }); - - Unsafe.Write(_dataTable.outArrayPtr, ({RetVectorType}<{RetBaseType}>)(result)); - ValidateResult(_dataTable.inArrayPtr, _dataTable.outArrayPtr); - } - - public void RunReflectionScenario_LoadAligned() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunReflectionScenario_LoadAligned)); - - var result = typeof({Isa}).GetMethod(nameof({Isa}.{Method})) - .MakeGenericMethod( new Type[] { typeof({Op1BaseType}) }) - .Invoke(null, new object[] { - {LoadIsa}.LoadAligned{Op1VectorType}(({Op1BaseType}*)(_dataTable.inArrayPtr)) - }); - - Unsafe.Write(_dataTable.outArrayPtr, ({RetVectorType}<{RetBaseType}>)(result)); - ValidateResult(_dataTable.inArrayPtr, _dataTable.outArrayPtr); - } - public void RunClsVarScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario)); @@ -250,28 +204,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(firstOp, _dataTable.outArrayPtr); } - public void RunLclVarScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_Load)); - - var firstOp = {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(_dataTable.inArrayPtr)); - var result = {Isa}.{Method}<{RetBaseType}>(firstOp); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(firstOp, _dataTable.outArrayPtr); - } - - public void RunLclVarScenario_LoadAligned() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_LoadAligned)); - - var firstOp = {LoadIsa}.LoadAligned{Op1VectorType}(({Op1BaseType}*)(_dataTable.inArrayPtr)); - var result = {Isa}.{Method}<{RetBaseType}>(firstOp); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(firstOp, _dataTable.outArrayPtr); - } - public void RunClassLclFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario)); diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Shared/ImmBinOpTest.template b/src/tests/JIT/HardwareIntrinsics/X86/Shared/ImmBinOpTest.template index 94bcb7aef90c12..998dde17a6af01 100644 --- a/src/tests/JIT/HardwareIntrinsics/X86/Shared/ImmBinOpTest.template +++ b/src/tests/JIT/HardwareIntrinsics/X86/Shared/ImmBinOpTest.template @@ -41,30 +41,12 @@ namespace JIT.HardwareIntrinsics.X86 // Validates calling via reflection works, using Unsafe.Read test.RunReflectionScenario_UnsafeRead(); - if ({LoadIsa}.IsSupported) - { - // Validates calling via reflection works, using Load - test.RunReflectionScenario_Load(); - - // Validates calling via reflection works, using LoadAligned - test.RunReflectionScenario_LoadAligned(); - } - // Validates passing a static member works test.RunClsVarScenario(); // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); - if ({LoadIsa}.IsSupported) - { - // Validates passing a local works, using Load - test.RunLclVarScenario_Load(); - - // Validates passing a local works, using LoadAligned - test.RunLclVarScenario_LoadAligned(); - } - // Validates passing the field of a local class works test.RunClassLclFldScenario(); @@ -218,36 +200,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(_dataTable.inArray1Ptr, _dataTable.inArray2Ptr, _dataTable.outArrayPtr); } - public void RunReflectionScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunReflectionScenario_Load)); - - var result = typeof({Isa}).GetMethod(nameof({Isa}.{Method}), new Type[] { typeof({Op1VectorType}<{Op1BaseType}>), typeof({Op2VectorType}<{Op2BaseType}>), typeof(byte) }) - .Invoke(null, new object[] { - {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(_dataTable.inArray1Ptr)), - {LoadIsa}.Load{Op2VectorType}(({Op2BaseType}*)(_dataTable.inArray2Ptr)), - (byte){Imm} - }); - - Unsafe.Write(_dataTable.outArrayPtr, ({RetVectorType}<{RetBaseType}>)(result)); - ValidateResult(_dataTable.inArray1Ptr, _dataTable.inArray2Ptr, _dataTable.outArrayPtr); - } - - public void RunReflectionScenario_LoadAligned() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunReflectionScenario_LoadAligned)); - - var result = typeof({Isa}).GetMethod(nameof({Isa}.{Method}), new Type[] { typeof({Op1VectorType}<{Op1BaseType}>), typeof({Op2VectorType}<{Op2BaseType}>), typeof(byte) }) - .Invoke(null, new object[] { - {LoadIsa}.LoadAligned{Op1VectorType}(({Op1BaseType}*)(_dataTable.inArray1Ptr)), - {LoadIsa}.LoadAligned{Op2VectorType}(({Op2BaseType}*)(_dataTable.inArray2Ptr)), - (byte){Imm} - }); - - Unsafe.Write(_dataTable.outArrayPtr, ({RetVectorType}<{RetBaseType}>)(result)); - ValidateResult(_dataTable.inArray1Ptr, _dataTable.inArray2Ptr, _dataTable.outArrayPtr); - } - public void RunClsVarScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario)); @@ -274,30 +226,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(left, right, _dataTable.outArrayPtr); } - public void RunLclVarScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_Load)); - - var left = {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(_dataTable.inArray1Ptr)); - var right = {LoadIsa}.Load{Op2VectorType}(({Op2BaseType}*)(_dataTable.inArray2Ptr)); - var result = {Isa}.{Method}(left, right, {Imm}); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(left, right, _dataTable.outArrayPtr); - } - - public void RunLclVarScenario_LoadAligned() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_LoadAligned)); - - var left = {LoadIsa}.LoadAligned{Op1VectorType}(({Op1BaseType}*)(_dataTable.inArray1Ptr)); - var right = {LoadIsa}.LoadAligned{Op2VectorType}(({Op2BaseType}*)(_dataTable.inArray2Ptr)); - var result = {Isa}.{Method}(left, right, {Imm}); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(left, right, _dataTable.outArrayPtr); - } - public void RunClassLclFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario)); diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Shared/ImmUnOpTest.template b/src/tests/JIT/HardwareIntrinsics/X86/Shared/ImmUnOpTest.template index 500c34fa3f901e..7a1928b58f439d 100644 --- a/src/tests/JIT/HardwareIntrinsics/X86/Shared/ImmUnOpTest.template +++ b/src/tests/JIT/HardwareIntrinsics/X86/Shared/ImmUnOpTest.template @@ -41,30 +41,12 @@ namespace JIT.HardwareIntrinsics.X86 // Validates calling via reflection works, using Unsafe.Read test.RunReflectionScenario_UnsafeRead(); - if ({LoadIsa}.IsSupported) - { - // Validates calling via reflection works, using Load - test.RunReflectionScenario_Load(); - - // Validates calling via reflection works, using LoadAligned - test.RunReflectionScenario_LoadAligned(); - } - // Validates passing a static member works test.RunClsVarScenario(); // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); - if ({LoadIsa}.IsSupported) - { - // Validates passing a local works, using Load - test.RunLclVarScenario_Load(); - - // Validates passing a local works, using LoadAligned - test.RunLclVarScenario_LoadAligned(); - } - // Validates passing the field of a local class works test.RunClassLclFldScenario(); @@ -202,34 +184,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(_dataTable.inArrayPtr, _dataTable.outArrayPtr); } - public void RunReflectionScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunReflectionScenario_Load)); - - var result = typeof({Isa}).GetMethod(nameof({Isa}.{Method}), new Type[] { typeof({Op1VectorType}<{Op1BaseType}>), typeof(byte) }) - .Invoke(null, new object[] { - {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(_dataTable.inArrayPtr)), - (byte){Imm} - }); - - Unsafe.Write(_dataTable.outArrayPtr, ({RetVectorType}<{RetBaseType}>)(result)); - ValidateResult(_dataTable.inArrayPtr, _dataTable.outArrayPtr); - } - - public void RunReflectionScenario_LoadAligned() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunReflectionScenario_LoadAligned)); - - var result = typeof({Isa}).GetMethod(nameof({Isa}.{Method}), new Type[] { typeof({Op1VectorType}<{Op1BaseType}>), typeof(byte) }) - .Invoke(null, new object[] { - {LoadIsa}.LoadAligned{Op1VectorType}(({Op1BaseType}*)(_dataTable.inArrayPtr)), - (byte){Imm} - }); - - Unsafe.Write(_dataTable.outArrayPtr, ({RetVectorType}<{RetBaseType}>)(result)); - ValidateResult(_dataTable.inArrayPtr, _dataTable.outArrayPtr); - } - public void RunClsVarScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario)); @@ -254,28 +208,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(firstOp, _dataTable.outArrayPtr); } - public void RunLclVarScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_Load)); - - var firstOp = {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(_dataTable.inArrayPtr)); - var result = {Isa}.{Method}(firstOp, {Imm}); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(firstOp, _dataTable.outArrayPtr); - } - - public void RunLclVarScenario_LoadAligned() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_LoadAligned)); - - var firstOp = {LoadIsa}.LoadAligned{Op1VectorType}(({Op1BaseType}*)(_dataTable.inArrayPtr)); - var result = {Isa}.{Method}(firstOp, {Imm}); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(firstOp, _dataTable.outArrayPtr); - } - public void RunClassLclFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario)); diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Shared/InsertScalarTest.template b/src/tests/JIT/HardwareIntrinsics/X86/Shared/InsertScalarTest.template index 35191c6d7650cf..5b272951df5546 100644 --- a/src/tests/JIT/HardwareIntrinsics/X86/Shared/InsertScalarTest.template +++ b/src/tests/JIT/HardwareIntrinsics/X86/Shared/InsertScalarTest.template @@ -41,30 +41,12 @@ namespace JIT.HardwareIntrinsics.X86 // Validates calling via reflection works, using Unsafe.Read test.RunReflectionScenario(); - if ({LoadIsa}.IsSupported) - { - // Validates calling via reflection works, using Load - test.RunReflectionScenario_Load(); - - // Validates calling via reflection works, using LoadAligned - test.RunReflectionScenario_LoadAligned(); - } - // Validates passing a static member works test.RunClsVarScenario(); // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario(); - if ({LoadIsa}.IsSupported) - { - // Validates passing a local works, using Load - test.RunLclVarScenario_Load(); - - // Validates passing a local works, using LoadAligned - test.RunLclVarScenario_LoadAligned(); - } - // Validates passing the field of a local class works test.RunClassLclFldScenario(); @@ -217,36 +199,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(_dataTable.inArrayPtr, {Data}, _dataTable.outArrayPtr); } - public void RunReflectionScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunReflectionScenario_Load)); - - var result = typeof({Isa}).GetMethod(nameof({Isa}.{Method}), new Type[] { typeof({Op1VectorType}<{Op1BaseType}>), typeof({RetBaseType}), typeof(byte) }) - .Invoke(null, new object[] { - {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(_dataTable.inArrayPtr)), - {Data}, - (byte){Imm} - }); - - Unsafe.Write(_dataTable.outArrayPtr, ({RetVectorType}<{RetBaseType}>)(result)); - ValidateResult(_dataTable.inArrayPtr, {Data}, _dataTable.outArrayPtr); - } - - public void RunReflectionScenario_LoadAligned() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunReflectionScenario_LoadAligned)); - - var result = typeof({Isa}).GetMethod(nameof({Isa}.{Method}), new Type[] { typeof({Op1VectorType}<{Op1BaseType}>), typeof({RetBaseType}), typeof(byte) }) - .Invoke(null, new object[] { - {LoadIsa}.LoadAligned{Op1VectorType}(({Op1BaseType}*)(_dataTable.inArrayPtr)), - {Data}, - (byte){Imm} - }); - - Unsafe.Write(_dataTable.outArrayPtr, ({RetVectorType}<{RetBaseType}>)(result)); - ValidateResult(_dataTable.inArrayPtr, {Data}, _dataTable.outArrayPtr); - } - public void RunClsVarScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario)); @@ -274,32 +226,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(firstOp, localData, _dataTable.outArrayPtr); } - public void RunLclVarScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_Load)); - - {Op1BaseType} localData = {Data}; - - var firstOp = {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(_dataTable.inArrayPtr)); - var result = {Isa}.{Method}(firstOp, localData, {Imm}); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(firstOp, localData, _dataTable.outArrayPtr); - } - - public void RunLclVarScenario_LoadAligned() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_LoadAligned)); - - {Op1BaseType} localData = {Data}; - - var firstOp = {LoadIsa}.LoadAligned{Op1VectorType}(({Op1BaseType}*)(_dataTable.inArrayPtr)); - var result = {Isa}.{Method}(firstOp, localData, {Imm}); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(firstOp, localData, _dataTable.outArrayPtr); - } - public void RunClassLclFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario)); diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Shared/InsertVector128Test.template b/src/tests/JIT/HardwareIntrinsics/X86/Shared/InsertVector128Test.template index d8076b1f6934a8..fb3466861da4a7 100644 --- a/src/tests/JIT/HardwareIntrinsics/X86/Shared/InsertVector128Test.template +++ b/src/tests/JIT/HardwareIntrinsics/X86/Shared/InsertVector128Test.template @@ -43,30 +43,12 @@ namespace JIT.HardwareIntrinsics.X86 // Validates calling via reflection works, using Unsafe.Read test.RunReflectionScenario_UnsafeRead(); - if ({LoadIsa}.IsSupported) - { - // Validates calling via reflection works, using Load - test.RunReflectionScenario_Load(); - - // Validates calling via reflection works, using LoadAligned - test.RunReflectionScenario_LoadAligned(); - } - // Validates passing a static member works test.RunClsVarScenario(); // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); - if ({LoadIsa}.IsSupported) - { - // Validates passing a local works, using Load - test.RunLclVarScenario_Load(); - - // Validates passing a local works, using LoadAligned - test.RunLclVarScenario_LoadAligned(); - } - // Validates passing the field of a local class works test.RunClassLclFldScenario(); @@ -220,36 +202,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(_dataTable.inArray1Ptr, _dataTable.inArray2Ptr, _dataTable.outArrayPtr); } - public void RunReflectionScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunReflectionScenario_Load)); - - var result = typeof({Isa}).GetMethod(nameof({Isa}.{Method}), new Type[] { typeof({Op1VectorType}<{Op1BaseType}>), typeof({Op2VectorType}<{Op2BaseType}>), typeof(byte) }) - .Invoke(null, new object[] { - {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(_dataTable.inArray1Ptr)), - Load{Op2VectorType}(({Op2BaseType}*)(_dataTable.inArray2Ptr)), - (byte){Imm} - }); - - Unsafe.Write(_dataTable.outArrayPtr, ({RetVectorType}<{RetBaseType}>)(result)); - ValidateResult(_dataTable.inArray1Ptr, _dataTable.inArray2Ptr, _dataTable.outArrayPtr); - } - - public void RunReflectionScenario_LoadAligned() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunReflectionScenario_LoadAligned)); - - var result = typeof({Isa}).GetMethod(nameof({Isa}.{Method}), new Type[] { typeof({Op1VectorType}<{Op1BaseType}>), typeof({Op2VectorType}<{Op2BaseType}>), typeof(byte) }) - .Invoke(null, new object[] { - {LoadIsa}.LoadAligned{Op1VectorType}(({Op1BaseType}*)(_dataTable.inArray1Ptr)), - LoadAligned{Op2VectorType}(({Op2BaseType}*)(_dataTable.inArray2Ptr)), - (byte){Imm} - }); - - Unsafe.Write(_dataTable.outArrayPtr, ({RetVectorType}<{RetBaseType}>)(result)); - ValidateResult(_dataTable.inArray1Ptr, _dataTable.inArray2Ptr, _dataTable.outArrayPtr); - } - public void RunClsVarScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario)); @@ -276,30 +228,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(left, right, _dataTable.outArrayPtr); } - public void RunLclVarScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_Load)); - - var left = {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(_dataTable.inArray1Ptr)); - var right = Load{Op2VectorType}(({Op2BaseType}*)(_dataTable.inArray2Ptr)); - var result = {Isa}.{Method}(left, right, {Imm}); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(left, right, _dataTable.outArrayPtr); - } - - public void RunLclVarScenario_LoadAligned() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_LoadAligned)); - - var left = {LoadIsa}.LoadAligned{Op1VectorType}(({Op1BaseType}*)(_dataTable.inArray1Ptr)); - var right = LoadAligned{Op2VectorType}(({Op2BaseType}*)(_dataTable.inArray2Ptr)); - var result = {Isa}.{Method}(left, right, {Imm}); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(left, right, _dataTable.outArrayPtr); - } - public void RunClassLclFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario)); diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Shared/LoadBinOpTest.template b/src/tests/JIT/HardwareIntrinsics/X86/Shared/LoadBinOpTest.template index 19ce2ce5eb4e01..247f268f4294c9 100644 --- a/src/tests/JIT/HardwareIntrinsics/X86/Shared/LoadBinOpTest.template +++ b/src/tests/JIT/HardwareIntrinsics/X86/Shared/LoadBinOpTest.template @@ -42,30 +42,12 @@ namespace JIT.HardwareIntrinsics.X86 // Validates calling via reflection works, using Unsafe.Read test.RunReflectionScenario_UnsafeRead(); - if ({LoadIsa}.IsSupported) - { - // Validates calling via reflection works, using Load - test.RunReflectionScenario_Load(); - - // Validates calling via reflection works, using LoadAligned - test.RunReflectionScenario_LoadAligned(); - } - // Validates passing a static member works test.RunClsVarScenario(); // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); - if ({LoadIsa}.IsSupported) - { - // Validates passing a local works, using Load - test.RunLclVarScenario_Load(); - - // Validates passing a local works, using LoadAligned - test.RunLclVarScenario_LoadAligned(); - } - // Validates passing the field of a local class works test.RunClassLclFldScenario(); @@ -211,34 +193,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(_dataTable.inArray1Ptr, _dataTable.inArray2Ptr, _dataTable.outArrayPtr); } - public void RunReflectionScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunReflectionScenario_Load)); - - var result = typeof({Isa}).GetMethod(nameof({Isa}.{Method}), new Type[] { typeof({RetBaseType}*), typeof({Op2VectorType}<{Op2BaseType}>) }) - .Invoke(null, new object[] { - Pointer.Box(_dataTable.inArray1Ptr, typeof({RetBaseType}*)), - {LoadIsa}.Load{Op2VectorType}(({Op2BaseType}*)(_dataTable.inArray2Ptr)) - }); - - Unsafe.Write(_dataTable.outArrayPtr, ({RetVectorType}<{RetBaseType}>)(result)); - ValidateResult(_dataTable.inArray1Ptr, _dataTable.inArray2Ptr, _dataTable.outArrayPtr); - } - - public void RunReflectionScenario_LoadAligned() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunReflectionScenario_LoadAligned)); - - var result = typeof({Isa}).GetMethod(nameof({Isa}.{Method}), new Type[] { typeof({RetBaseType}*), typeof({Op2VectorType}<{Op2BaseType}>) }) - .Invoke(null, new object[] { - Pointer.Box(_dataTable.inArray1Ptr, typeof({RetBaseType}*)), - {LoadIsa}.LoadAligned{Op2VectorType}(({Op2BaseType}*)(_dataTable.inArray2Ptr)) - }); - - Unsafe.Write(_dataTable.outArrayPtr, ({RetVectorType}<{RetBaseType}>)(result)); - ValidateResult(_dataTable.inArray1Ptr, _dataTable.inArray2Ptr, _dataTable.outArrayPtr); - } - public void RunClsVarScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario)); @@ -264,30 +218,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(left, right, _dataTable.outArrayPtr); } - public void RunLclVarScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_Load)); - - var left = ({RetBaseType}*)_dataTable.inArray1Ptr; - var right = {LoadIsa}.Load{Op2VectorType}(({Op2BaseType}*)(_dataTable.inArray2Ptr)); - var result = {Isa}.{Method}(left, right); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(left, right, _dataTable.outArrayPtr); - } - - public void RunLclVarScenario_LoadAligned() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_LoadAligned)); - - var left = ({RetBaseType}*)_dataTable.inArray1Ptr; - var right = {LoadIsa}.LoadAligned{Op2VectorType}(({Op2BaseType}*)(_dataTable.inArray2Ptr)); - var result = {Isa}.{Method}(left, right); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(left, right, _dataTable.outArrayPtr); - } - public void RunClassLclFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario)); diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Shared/PclmulqdqOpTest.template b/src/tests/JIT/HardwareIntrinsics/X86/Shared/PclmulqdqOpTest.template index 92d142d28c1835..871e9bc011e228 100644 --- a/src/tests/JIT/HardwareIntrinsics/X86/Shared/PclmulqdqOpTest.template +++ b/src/tests/JIT/HardwareIntrinsics/X86/Shared/PclmulqdqOpTest.template @@ -41,30 +41,12 @@ namespace JIT.HardwareIntrinsics.X86 // Validates calling via reflection works, using Unsafe.Read test.RunReflectionScenario_UnsafeRead(); - if ({LoadIsa}.IsSupported) - { - // Validates calling via reflection works, using Load - test.RunReflectionScenario_Load(); - - // Validates calling via reflection works, using LoadAligned - test.RunReflectionScenario_LoadAligned(); - } - // Validates passing a static member works test.RunClsVarScenario(); // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); - if ({LoadIsa}.IsSupported) - { - // Validates passing a local works, using Load - test.RunLclVarScenario_Load(); - - // Validates passing a local works, using LoadAligned - test.RunLclVarScenario_LoadAligned(); - } - // Validates passing the field of a local class works test.RunClassLclFldScenario(); @@ -211,36 +193,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(_dataTable.outArrayPtr); } - public void RunReflectionScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunReflectionScenario_Load)); - - var result = typeof({Isa}).GetMethod(nameof({Isa}.{Method}), new Type[] { typeof({Op1VectorType}<{Op1BaseType}>), typeof({Op2VectorType}<{Op2BaseType}>), typeof(byte) }) - .Invoke(null, new object[] { - {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(_dataTable.inArray1Ptr)), - {LoadIsa}.Load{Op2VectorType}(({Op2BaseType}*)(_dataTable.inArray2Ptr)), - (byte){Imm} - }); - - Unsafe.Write(_dataTable.outArrayPtr, ({RetVectorType}<{RetBaseType}>)(result)); - ValidateResult(_dataTable.outArrayPtr); - } - - public void RunReflectionScenario_LoadAligned() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunReflectionScenario_LoadAligned)); - - var result = typeof({Isa}).GetMethod(nameof({Isa}.{Method}), new Type[] { typeof({Op1VectorType}<{Op1BaseType}>), typeof({Op2VectorType}<{Op2BaseType}>), typeof(byte) }) - .Invoke(null, new object[] { - {LoadIsa}.LoadAligned{Op1VectorType}(({Op1BaseType}*)(_dataTable.inArray1Ptr)), - {LoadIsa}.LoadAligned{Op2VectorType}(({Op2BaseType}*)(_dataTable.inArray2Ptr)), - (byte){Imm} - }); - - Unsafe.Write(_dataTable.outArrayPtr, ({RetVectorType}<{RetBaseType}>)(result)); - ValidateResult(_dataTable.outArrayPtr); - } - public void RunClsVarScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario)); @@ -267,30 +219,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(_dataTable.outArrayPtr); } - public void RunLclVarScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_Load)); - - var left = {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(_dataTable.inArray1Ptr)); - var right = {LoadIsa}.Load{Op2VectorType}(({Op2BaseType}*)(_dataTable.inArray2Ptr)); - var result = {Isa}.{Method}(left, right, {Imm}); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(_dataTable.outArrayPtr); - } - - public void RunLclVarScenario_LoadAligned() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_LoadAligned)); - - var left = {LoadIsa}.LoadAligned{Op1VectorType}(({Op1BaseType}*)(_dataTable.inArray1Ptr)); - var right = {LoadIsa}.LoadAligned{Op2VectorType}(({Op2BaseType}*)(_dataTable.inArray2Ptr)); - var result = {Isa}.{Method}(left, right, {Imm}); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(_dataTable.outArrayPtr); - } - public void RunClassLclFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario)); diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Shared/SimdScalarUnOpConvTest.template b/src/tests/JIT/HardwareIntrinsics/X86/Shared/SimdScalarUnOpConvTest.template index f79e2d8d005157..4f4fae5e64d631 100644 --- a/src/tests/JIT/HardwareIntrinsics/X86/Shared/SimdScalarUnOpConvTest.template +++ b/src/tests/JIT/HardwareIntrinsics/X86/Shared/SimdScalarUnOpConvTest.template @@ -42,30 +42,12 @@ namespace JIT.HardwareIntrinsics.X86 // Validates calling via reflection works, using Unsafe.Read test.RunReflectionScenario_UnsafeRead(); - if ({LoadIsa}.IsSupported) - { - // Validates calling via reflection works, using Load - test.RunReflectionScenario_Load(); - - // Validates calling via reflection works, using LoadAligned - test.RunReflectionScenario_LoadAligned(); - } - // Validates passing a static member works test.RunClsVarScenario(); // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); - if ({LoadIsa}.IsSupported) - { - // Validates passing a local works, using Load - test.RunLclVarScenario_Load(); - - // Validates passing a local works, using LoadAligned - test.RunLclVarScenario_LoadAligned(); - } - // Validates passing the field of a local class works test.RunClassLclFldScenario(); @@ -192,30 +174,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(_dataTable.inArrayPtr, ({RetBaseType})(result)); } - public void RunReflectionScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunReflectionScenario_Load)); - - var result = typeof({Isa}).GetMethod(nameof({Isa}.{Method}), new Type[] { typeof({Op1VectorType}<{Op1BaseType}>) }) - .Invoke(null, new object[] { - {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(_dataTable.inArrayPtr)) - }); - - ValidateResult(_dataTable.inArrayPtr, ({RetBaseType})(result)); - } - - public void RunReflectionScenario_LoadAligned() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunReflectionScenario_LoadAligned)); - - var result = typeof({Isa}).GetMethod(nameof({Isa}.{Method}), new Type[] { typeof({Op1VectorType}<{Op1BaseType}>) }) - .Invoke(null, new object[] { - {LoadIsa}.LoadAligned{Op1VectorType}(({Op1BaseType}*)(_dataTable.inArrayPtr)) - }); - - ValidateResult(_dataTable.inArrayPtr, ({RetBaseType})(result)); - } - public void RunClsVarScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario)); @@ -237,26 +195,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(firstOp, result); } - public void RunLclVarScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_Load)); - - var firstOp = {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(_dataTable.inArrayPtr)); - var result = {Isa}.{Method}(firstOp); - - ValidateResult(firstOp, result); - } - - public void RunLclVarScenario_LoadAligned() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_LoadAligned)); - - var firstOp = {LoadIsa}.LoadAligned{Op1VectorType}(({Op1BaseType}*)(_dataTable.inArrayPtr)); - var result = {Isa}.{Method}(firstOp); - - ValidateResult(firstOp, result); - } - public void RunClassLclFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario)); diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Shared/SimdScalarUnOpTest.template b/src/tests/JIT/HardwareIntrinsics/X86/Shared/SimdScalarUnOpTest.template index 77cb2422e73d5f..042a30ccc4d70c 100644 --- a/src/tests/JIT/HardwareIntrinsics/X86/Shared/SimdScalarUnOpTest.template +++ b/src/tests/JIT/HardwareIntrinsics/X86/Shared/SimdScalarUnOpTest.template @@ -42,30 +42,12 @@ namespace JIT.HardwareIntrinsics.X86 // Validates calling via reflection works, using Unsafe.Read test.RunReflectionScenario_UnsafeRead(); - if ({LoadIsa}.IsSupported) - { - // Validates calling via reflection works, using Load - test.RunReflectionScenario_Load(); - - // Validates calling via reflection works, using LoadAligned - test.RunReflectionScenario_LoadAligned(); - } - // Validates passing a static member works test.RunClsVarScenario(); // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); - if ({LoadIsa}.IsSupported) - { - // Validates passing a local works, using Load - test.RunLclVarScenario_Load(); - - // Validates passing a local works, using LoadAligned - test.RunLclVarScenario_LoadAligned(); - } - // Validates passing the field of a local class works test.RunClassLclFldScenario(); @@ -192,30 +174,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(_dataTable.inArrayPtr, ({RetBaseType})(result)); } - public void RunReflectionScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunReflectionScenario_Load)); - - var result = typeof({Isa}).GetMethod(nameof({Isa}.{Method}), new Type[] { typeof({Op1VectorType}<{Op1BaseType}>) }) - .Invoke(null, new object[] { - {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(_dataTable.inArrayPtr)) - }); - - ValidateResult(_dataTable.inArrayPtr, ({RetBaseType})(result)); - } - - public void RunReflectionScenario_LoadAligned() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunReflectionScenario_LoadAligned)); - - var result = typeof({Isa}).GetMethod(nameof({Isa}.{Method}), new Type[] { typeof({Op1VectorType}<{Op1BaseType}>) }) - .Invoke(null, new object[] { - {LoadIsa}.LoadAligned{Op1VectorType}(({Op1BaseType}*)(_dataTable.inArrayPtr)) - }); - - ValidateResult(_dataTable.inArrayPtr, ({RetBaseType})(result)); - } - public void RunClsVarScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario)); @@ -237,26 +195,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(firstOp, result); } - public void RunLclVarScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_Load)); - - var firstOp = {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(_dataTable.inArrayPtr)); - var result = {Isa}.{Method}(firstOp); - - ValidateResult(firstOp, result); - } - - public void RunLclVarScenario_LoadAligned() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_LoadAligned)); - - var firstOp = {LoadIsa}.LoadAligned{Op1VectorType}(({Op1BaseType}*)(_dataTable.inArrayPtr)); - var result = {Isa}.{Method}(firstOp); - - ValidateResult(firstOp, result); - } - public void RunClassLclFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario)); diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Shared/SimpleBinOpConvTest.template b/src/tests/JIT/HardwareIntrinsics/X86/Shared/SimpleBinOpConvTest.template index 7c83efd8b70e74..765269c3b49a19 100644 --- a/src/tests/JIT/HardwareIntrinsics/X86/Shared/SimpleBinOpConvTest.template +++ b/src/tests/JIT/HardwareIntrinsics/X86/Shared/SimpleBinOpConvTest.template @@ -42,30 +42,12 @@ namespace JIT.HardwareIntrinsics.X86 // Validates calling via reflection works, using Unsafe.Read test.RunReflectionScenario_UnsafeRead(); - if ({LoadIsa}.IsSupported) - { - // Validates calling via reflection works, using Load - test.RunReflectionScenario_Load(); - - // Validates calling via reflection works, using LoadAligned - test.RunReflectionScenario_LoadAligned(); - } - // Validates passing a static member works test.RunClsVarScenario(); // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); - if ({LoadIsa}.IsSupported) - { - // Validates passing a local works, using Load - test.RunLclVarScenario_Load(); - - // Validates passing a local works, using LoadAligned - test.RunLclVarScenario_LoadAligned(); - } - // Validates passing the field of a local class works test.RunClassLclFldScenario(); @@ -211,34 +193,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(_dataTable.inArray1Ptr, _dataTable.inData2, _dataTable.outArrayPtr); } - public void RunReflectionScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunReflectionScenario_Load)); - - var result = typeof({Isa}).GetMethod(nameof({Isa}.{Method}), new Type[] { typeof({Op1VectorType}<{Op1BaseType}>), typeof({Op2BaseType}) }) - .Invoke(null, new object[] { - {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(_dataTable.inArray1Ptr)), - _dataTable.inData2 - }); - - Unsafe.Write(_dataTable.outArrayPtr, ({RetVectorType}<{RetBaseType}>)(result)); - ValidateResult(_dataTable.inArray1Ptr, _dataTable.inData2, _dataTable.outArrayPtr); - } - - public void RunReflectionScenario_LoadAligned() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunReflectionScenario_LoadAligned)); - - var result = typeof({Isa}).GetMethod(nameof({Isa}.{Method}), new Type[] { typeof({Op1VectorType}<{Op1BaseType}>), typeof({Op2BaseType}) }) - .Invoke(null, new object[] { - {LoadIsa}.LoadAligned{Op1VectorType}(({Op1BaseType}*)(_dataTable.inArray1Ptr)), - _dataTable.inData2 - }); - - Unsafe.Write(_dataTable.outArrayPtr, ({RetVectorType}<{RetBaseType}>)(result)); - ValidateResult(_dataTable.inArray1Ptr, _dataTable.inData2, _dataTable.outArrayPtr); - } - public void RunClsVarScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario)); @@ -264,30 +218,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(left, right, _dataTable.outArrayPtr); } - public void RunLclVarScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_Load)); - - var left = {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(_dataTable.inArray1Ptr)); - var right = _dataTable.inData2; - var result = {Isa}.{Method}(left, right); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(left, right, _dataTable.outArrayPtr); - } - - public void RunLclVarScenario_LoadAligned() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_LoadAligned)); - - var left = {LoadIsa}.LoadAligned{Op1VectorType}(({Op1BaseType}*)(_dataTable.inArray1Ptr)); - var right = _dataTable.inData2; - var result = {Isa}.{Method}(left, right); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(left, right, _dataTable.outArrayPtr); - } - public void RunClassLclFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario)); diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Shared/SimpleUnOpConvTest.template b/src/tests/JIT/HardwareIntrinsics/X86/Shared/SimpleUnOpConvTest.template index 1faa0db95f5039..355d754869cb01 100644 --- a/src/tests/JIT/HardwareIntrinsics/X86/Shared/SimpleUnOpConvTest.template +++ b/src/tests/JIT/HardwareIntrinsics/X86/Shared/SimpleUnOpConvTest.template @@ -41,30 +41,12 @@ namespace JIT.HardwareIntrinsics.X86 // Validates calling via reflection works, using Unsafe.Read test.RunReflectionScenario_UnsafeRead(); - if ({LoadIsa}.IsSupported) - { - // Validates calling via reflection works, using Load - test.RunReflectionScenario_Load(); - - // Validates calling via reflection works, using LoadAligned - test.RunReflectionScenario_LoadAligned(); - } - // Validates passing a static member works test.RunClsVarScenario(); // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); - if ({LoadIsa}.IsSupported) - { - // Validates passing a local works, using Load - test.RunLclVarScenario_Load(); - - // Validates passing a local works, using LoadAligned - test.RunLclVarScenario_LoadAligned(); - } - // Validates passing the field of a local class works test.RunClassLclFldScenario(); @@ -198,32 +180,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(_dataTable.inArrayPtr, _dataTable.outArrayPtr); } - public void RunReflectionScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunReflectionScenario_Load)); - - var result = typeof({Isa}).GetMethod(nameof({Isa}.{Method}), new Type[] { typeof({Op1VectorType}<{Op1BaseType}>) }) - .Invoke(null, new object[] { - {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(_dataTable.inArrayPtr)) - }); - - Unsafe.Write(_dataTable.outArrayPtr, ({RetVectorType}<{RetBaseType}>)(result)); - ValidateResult(_dataTable.inArrayPtr, _dataTable.outArrayPtr); - } - - public void RunReflectionScenario_LoadAligned() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunReflectionScenario_LoadAligned)); - - var result = typeof({Isa}).GetMethod(nameof({Isa}.{Method}), new Type[] { typeof({Op1VectorType}<{Op1BaseType}>) }) - .Invoke(null, new object[] { - {LoadIsa}.LoadAligned{Op1VectorType}(({Op1BaseType}*)(_dataTable.inArrayPtr)) - }); - - Unsafe.Write(_dataTable.outArrayPtr, ({RetVectorType}<{RetBaseType}>)(result)); - ValidateResult(_dataTable.inArrayPtr, _dataTable.outArrayPtr); - } - public void RunClsVarScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario)); @@ -247,28 +203,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(firstOp, _dataTable.outArrayPtr); } - public void RunLclVarScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_Load)); - - var firstOp = {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(_dataTable.inArrayPtr)); - var result = {Isa}.{Method}(firstOp); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(firstOp, _dataTable.outArrayPtr); - } - - public void RunLclVarScenario_LoadAligned() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_LoadAligned)); - - var firstOp = {LoadIsa}.LoadAligned{Op1VectorType}(({Op1BaseType}*)(_dataTable.inArrayPtr)); - var result = {Isa}.{Method}(firstOp); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(firstOp, _dataTable.outArrayPtr); - } - public void RunClassLclFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario)); diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Shared/StoreBinOpTest.template b/src/tests/JIT/HardwareIntrinsics/X86/Shared/StoreBinOpTest.template index 6a058ce9b9b30e..fb60432ccb737e 100644 --- a/src/tests/JIT/HardwareIntrinsics/X86/Shared/StoreBinOpTest.template +++ b/src/tests/JIT/HardwareIntrinsics/X86/Shared/StoreBinOpTest.template @@ -42,30 +42,12 @@ namespace JIT.HardwareIntrinsics.X86 // Validates calling via reflection works, using Unsafe.Read test.RunReflectionScenario_UnsafeRead(); - if ({LoadIsa}.IsSupported) - { - // Validates calling via reflection works, using Load - test.RunReflectionScenario_Load(); - - // Validates calling via reflection works, using LoadAligned - test.RunReflectionScenario_LoadAligned(); - } - // Validates passing a static member works test.RunClsVarScenario(); // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); - if ({LoadIsa}.IsSupported) - { - // Validates passing a local works, using Load - test.RunLclVarScenario_Load(); - - // Validates passing a local works, using LoadAligned - test.RunLclVarScenario_LoadAligned(); - } - // Validates passing the field of a local class works test.RunClassLclFldScenario(); @@ -213,34 +195,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(_dataTable.inArray1Ptr, _dataTable.inArray2Ptr, _dataTable.outArrayPtr); } - public void RunReflectionScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunReflectionScenario_Load)); - - typeof({Isa}).GetMethod(nameof({Isa}.{Method}), new Type[] { typeof({RetBaseType}*), typeof({Op1VectorType}<{Op1BaseType}>), typeof({Op2VectorType}<{Op2BaseType}>) }) - .Invoke(null, new object[] { - Pointer.Box(_dataTable.outArrayPtr, typeof({RetBaseType}*)), - {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(_dataTable.inArray1Ptr)), - {LoadIsa}.Load{Op2VectorType}(({Op2BaseType}*)(_dataTable.inArray2Ptr)) - }); - - ValidateResult(_dataTable.inArray1Ptr, _dataTable.inArray2Ptr, _dataTable.outArrayPtr); - } - - public void RunReflectionScenario_LoadAligned() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunReflectionScenario_LoadAligned)); - - typeof({Isa}).GetMethod(nameof({Isa}.{Method}), new Type[] { typeof({RetBaseType}*), typeof({Op1VectorType}<{Op1BaseType}>), typeof({Op2VectorType}<{Op2BaseType}>) }) - .Invoke(null, new object[] { - Pointer.Box(_dataTable.outArrayPtr, typeof({RetBaseType}*)), - {LoadIsa}.LoadAligned{Op1VectorType}(({Op1BaseType}*)(_dataTable.inArray1Ptr)), - {LoadIsa}.LoadAligned{Op2VectorType}(({Op2BaseType}*)(_dataTable.inArray2Ptr)) - }); - - ValidateResult(_dataTable.inArray1Ptr, _dataTable.inArray2Ptr, _dataTable.outArrayPtr); - } - public void RunClsVarScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario)); @@ -265,28 +219,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(left, right, _dataTable.outArrayPtr); } - public void RunLclVarScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_Load)); - - var left = {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(_dataTable.inArray1Ptr)); - var right = {LoadIsa}.Load{Op2VectorType}(({Op2BaseType}*)(_dataTable.inArray2Ptr)); - {Isa}.{Method}(({RetBaseType}*)_dataTable.outArrayPtr, left, right); - - ValidateResult(left, right, _dataTable.outArrayPtr); - } - - public void RunLclVarScenario_LoadAligned() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_LoadAligned)); - - var left = {LoadIsa}.LoadAligned{Op1VectorType}(({Op1BaseType}*)(_dataTable.inArray1Ptr)); - var right = {LoadIsa}.LoadAligned{Op2VectorType}(({Op2BaseType}*)(_dataTable.inArray2Ptr)); - {Isa}.{Method}(({RetBaseType}*)_dataTable.outArrayPtr, left, right); - - ValidateResult(left, right, _dataTable.outArrayPtr); - } - public void RunClassLclFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario)); diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Shared/StoreUnOpTest.template b/src/tests/JIT/HardwareIntrinsics/X86/Shared/StoreUnOpTest.template index 00824139c88293..79092161cfd43d 100644 --- a/src/tests/JIT/HardwareIntrinsics/X86/Shared/StoreUnOpTest.template +++ b/src/tests/JIT/HardwareIntrinsics/X86/Shared/StoreUnOpTest.template @@ -42,30 +42,12 @@ namespace JIT.HardwareIntrinsics.X86 // Validates calling via reflection works, using Unsafe.Read test.RunReflectionScenario_UnsafeRead(); - if ({LoadIsa}.IsSupported) - { - // Validates calling via reflection works, using Load - test.RunReflectionScenario_Load(); - - // Validates calling via reflection works, using LoadAligned - test.RunReflectionScenario_LoadAligned(); - } - // Validates passing a static member works test.RunClsVarScenario(); // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); - if ({LoadIsa}.IsSupported) - { - // Validates passing a local works, using Load - test.RunLclVarScenario_Load(); - - // Validates passing a local works, using LoadAligned - test.RunLclVarScenario_LoadAligned(); - } - // Validates passing the field of a local class works test.RunClassLclFldScenario(); @@ -197,32 +179,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(_dataTable.inArrayPtr, _dataTable.outArrayPtr); } - public void RunReflectionScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunReflectionScenario_Load)); - - typeof({Isa}).GetMethod(nameof({Isa}.{Method}), new Type[] { typeof({RetBaseType}*), typeof({Op1VectorType}<{Op1BaseType}>) }) - .Invoke(null, new object[] { - Pointer.Box(_dataTable.outArrayPtr, typeof({RetBaseType}*)), - {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(_dataTable.inArrayPtr)) - }); - - ValidateResult(_dataTable.inArrayPtr, _dataTable.outArrayPtr); - } - - public void RunReflectionScenario_LoadAligned() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunReflectionScenario_LoadAligned)); - - typeof({Isa}).GetMethod(nameof({Isa}.{Method}), new Type[] { typeof({RetBaseType}*), typeof({Op1VectorType}<{Op1BaseType}>) }) - .Invoke(null, new object[] { - Pointer.Box(_dataTable.outArrayPtr, typeof({RetBaseType}*)), - {LoadIsa}.LoadAligned{Op1VectorType}(({Op1BaseType}*)(_dataTable.inArrayPtr)) - }); - - ValidateResult(_dataTable.inArrayPtr, _dataTable.outArrayPtr); - } - public void RunClsVarScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario)); @@ -245,26 +201,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(value, _dataTable.outArrayPtr); } - public void RunLclVarScenario_Load() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_Load)); - - var value = {LoadIsa}.Load{Op1VectorType}(({Op1BaseType}*)(_dataTable.inArrayPtr)); - {Isa}.{Method}(({RetBaseType}*)_dataTable.outArrayPtr, value); - - ValidateResult(value, _dataTable.outArrayPtr); - } - - public void RunLclVarScenario_LoadAligned() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_LoadAligned)); - - var value = {LoadIsa}.LoadAligned{Op1VectorType}(({Op1BaseType}*)(_dataTable.inArrayPtr)); - {Isa}.{Method}(({RetBaseType}*)_dataTable.outArrayPtr, value); - - ValidateResult(value, _dataTable.outArrayPtr); - } - public void RunClassLclFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario)); From 5df76a5bd84af314908c00717baae97b79189805 Mon Sep 17 00:00:00 2001 From: Tanner Gooding Date: Tue, 18 Apr 2023 17:48:27 -0700 Subject: [PATCH 02/10] Remove ClsVar scenarios from HWIntrinsic test templates --- .../Arm/Shared/AesBinOpTest.template | 33 ++----------- .../Arm/Shared/AesUnOpTest.template | 23 --------- .../Arm/Shared/ExtractTest.template | 20 -------- .../Arm/Shared/ExtractVectorTest.template | 28 ----------- .../Arm/Shared/InsertScalarTest.template | 28 ----------- .../Shared/InsertSelectedScalarTest.template | 29 ------------ .../Arm/Shared/InsertTest.template | 28 ----------- .../Shared/LoadAndInsertScalarTest.template | 30 ------------ .../Arm/Shared/LoadPairVectorTest.template | 15 ------ .../Arm/Shared/ScalarBinOpTest.template | 24 ---------- .../Arm/Shared/ScalarUnOpTest.template | 23 +-------- .../Arm/Shared/StoreBinOpTest.template | 23 --------- .../Shared/StoreSelectedScalarTest.template | 20 -------- .../Arm/Shared/StoreUnOpTest.template | 20 -------- .../VectorLookupExtension_2Test.template | 43 ++--------------- .../VectorLookupExtension_3Test.template | 43 +---------------- .../VectorLookupExtension_4Test.template | 45 +----------------- .../Arm/Shared/VectorLookup_2Test.template | 35 +------------- .../Arm/Shared/VectorLookup_3Test.template | 41 ++-------------- .../Arm/Shared/VectorLookup_4Test.template | 47 ++----------------- .../Arm/Shared/_BinaryOpTestTemplate.template | 27 ----------- .../Shared/_ImmBinaryOpTestTemplate.template | 28 ----------- .../Shared/_ImmTernaryOpTestTemplate.template | 32 ------------- .../Shared/_ImmUnaryOpTestTemplate.template | 24 ---------- .../Shared/_TernaryOpTestTemplate.template | 31 ------------ .../_UnaryOpScalarTestTemplate.template | 22 --------- .../Arm/Shared/_UnaryOpTestTemplate.template | 23 --------- .../X86/Shared/AesBinOpTest.template | 33 ++----------- .../X86/Shared/AesImmOpTest.template | 24 ---------- .../X86/Shared/AesUnOpTest.template | 23 --------- .../X86/Shared/ExtractScalarTest.template | 24 ---------- .../X86/Shared/ExtractVector128Test.template | 24 ---------- .../X86/Shared/GenericUnOpTest.template | 23 --------- .../X86/Shared/ImmBinOpTest.template | 28 ----------- .../X86/Shared/ImmUnOpTest.template | 24 ---------- .../X86/Shared/InsertScalarTest.template | 25 ---------- .../X86/Shared/InsertVector128Test.template | 28 ----------- .../X86/Shared/LoadBinOpTest.template | 26 ---------- .../X86/Shared/PclmulqdqOpTest.template | 29 +----------- .../X86/Shared/ScalarBinOpTest.template | 24 ---------- .../X86/Shared/ScalarSimdUnOpTest.template | 22 --------- .../Shared/ScalarTernOpBinResTest.template | 27 ----------- .../X86/Shared/ScalarTernOpTest.template | 27 ----------- .../ScalarTernOpTupleBinRetTest.template | 27 ----------- .../X86/Shared/ScalarUnOpTest.template | 23 +-------- .../Shared/SimdScalarUnOpConvTest.template | 22 --------- .../X86/Shared/SimdScalarUnOpTest.template | 22 --------- .../X86/Shared/SimpleBinOpConvTest.template | 27 ----------- .../X86/Shared/SimpleUnOpConvTest.template | 23 --------- .../X86/Shared/StoreBinOpTest.template | 27 ----------- .../X86/Shared/StoreUnOpTest.template | 23 --------- .../X86/Shared/_BinaryOpTestTemplate.template | 27 ----------- .../_BooleanBinaryOpTestTemplate.template | 26 ---------- .../_BooleanUnaryOpTestTemplate.template | 22 --------- .../Shared/_TernaryOpTestTemplate.template | 31 ------------ .../X86/Shared/_UnaryOpTestTemplate.template | 23 --------- 56 files changed, 25 insertions(+), 1494 deletions(-) diff --git a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/AesBinOpTest.template b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/AesBinOpTest.template index df9807f4927e22..15e9553d2de89e 100644 --- a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/AesBinOpTest.template +++ b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/AesBinOpTest.template @@ -38,9 +38,6 @@ namespace JIT.HardwareIntrinsics.Arm // Validates calling via reflection works, using Unsafe.Read test.RunReflectionScenario_UnsafeRead(); - // Validates passing a static member works - test.RunClsVarScenario(); - // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); @@ -152,28 +149,17 @@ namespace JIT.HardwareIntrinsics.Arm private static readonly int LargestVectorSize = {LargestVectorSize}; private static readonly int RetElementCount = Unsafe.SizeOf<{RetVectorType}<{RetBaseType}>>() / sizeof({RetBaseType}); - + private static {Op1BaseType}[] _data1 = new {Op1BaseType}[{InputSize}] {Input}; private static {Op2BaseType}[] _data2 = new {Op2BaseType}[{KeySize}] {Key}; private static {RetBaseType}[] _expectedRet = new {RetBaseType}[{ExpectedRetSize}] {ExpectedRet}; - private static {Op1VectorType}<{Op1BaseType}> _clsVar1; - private static {Op2VectorType}<{Op2BaseType}> _clsVar2; - private {Op1VectorType}<{Op1BaseType}> _fld1; private {Op2VectorType}<{Op2BaseType}> _fld2; private DataTable _dataTable; - static AesBinaryOpTest__{TestName}() - { - - Unsafe.CopyBlockUnaligned(ref Unsafe.As<{Op1VectorType}<{Op1BaseType}>, byte>(ref _clsVar1), ref Unsafe.As<{Op1BaseType}, byte>(ref _data1[0]), (uint)Unsafe.SizeOf<{Op1VectorType}<{Op1BaseType}>>()); - - Unsafe.CopyBlockUnaligned(ref Unsafe.As<{Op2VectorType}<{Op2BaseType}>, byte>(ref _clsVar2), ref Unsafe.As<{Op2BaseType}, byte>(ref _data2[0]), (uint)Unsafe.SizeOf<{Op2VectorType}<{Op2BaseType}>>()); - } - public AesBinaryOpTest__{TestName}() { Succeeded = true; @@ -229,19 +215,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(_dataTable.outArrayPtr); } - public void RunClsVarScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario)); - - var result = {Isa}.{Method}( - _clsVar1, - _clsVar2 - ); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(_dataTable.outArrayPtr); - } - public void RunLclVarScenario_UnsafeRead() { TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_UnsafeRead)); @@ -325,7 +298,7 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(outArray, method); } - + private void ValidateResult({RetBaseType}[] result, [CallerMemberName] string method = "") { bool succeeded = true; @@ -335,7 +308,7 @@ namespace JIT.HardwareIntrinsics.Arm if (result[i] != _expectedRet[i] ) { succeeded = false; - } + } } if (!succeeded) diff --git a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/AesUnOpTest.template b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/AesUnOpTest.template index 1e5588b9c6fece..4c74b236d36614 100644 --- a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/AesUnOpTest.template +++ b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/AesUnOpTest.template @@ -38,9 +38,6 @@ namespace JIT.HardwareIntrinsics.Arm // Validates calling via reflection works, using Unsafe.Read test.RunReflectionScenario_UnsafeRead(); - // Validates passing a static member works - test.RunClsVarScenario(); - // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); @@ -144,19 +141,11 @@ namespace JIT.HardwareIntrinsics.Arm private static {Op1BaseType}[] _data = new {Op1BaseType}[{InputSize}] {Input}; private static {RetBaseType}[] _expectedRet = new {RetBaseType}[{ExpectedRetSize}] {ExpectedRet}; - - private static {Op1VectorType}<{Op1BaseType}> _clsVar; private {Op1VectorType}<{Op1BaseType}> _fld; private DataTable _dataTable; - static AesUnaryOpTest__{TestName}() - { - - Unsafe.CopyBlockUnaligned(ref Unsafe.As<{Op1VectorType}<{Op1BaseType}>, byte>(ref _clsVar), ref Unsafe.As<{Op1BaseType}, byte>(ref _data[0]), (uint)Unsafe.SizeOf<{Op1VectorType}<{Op1BaseType}>>()); - } - public AesUnaryOpTest__{TestName}() { Succeeded = true; @@ -208,18 +197,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(_dataTable.outArrayPtr); } - public void RunClsVarScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario)); - - var result = {Isa}.{Method}( - _clsVar - ); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(_dataTable.outArrayPtr); - } - public void RunLclVarScenario_UnsafeRead() { TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_UnsafeRead)); diff --git a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/ExtractTest.template b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/ExtractTest.template index 5feada12628074..b9bde14eb23608 100644 --- a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/ExtractTest.template +++ b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/ExtractTest.template @@ -38,9 +38,6 @@ namespace JIT.HardwareIntrinsics.Arm // Validates calling via reflection works, using Unsafe.Read test.RunReflectionScenario_UnsafeRead(); - // Validates passing a static member works - test.RunClsVarScenario(); - // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); @@ -137,18 +134,10 @@ namespace JIT.HardwareIntrinsics.Arm private static {Op1BaseType}[] _data1 = new {Op1BaseType}[Op1ElementCount]; - private static {Op1VectorType}<{Op1BaseType}> _clsVar1; - private {Op1VectorType}<{Op1BaseType}> _fld1; private DataTable _dataTable; - static ExtractTest__{TestName}() - { - for (var i = 0; i < Op1ElementCount; i++) { _data1[i] = {NextValueOp1}; } - Unsafe.CopyBlockUnaligned(ref Unsafe.As<{Op1VectorType}<{Op1BaseType}>, byte>(ref _clsVar1), ref Unsafe.As<{Op1BaseType}, byte>(ref _data1[0]), (uint)Unsafe.SizeOf<{Op1VectorType}<{Op1BaseType}>>()); - } - public ExtractTest__{TestName}() { Succeeded = true; @@ -201,15 +190,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(_dataTable.inArray1Ptr, ({Op1BaseType})result); } - public void RunClsVarScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario)); - - var result = {Isa}.{Method}(_clsVar1, ElementIndex); - - ValidateResult(_clsVar1, result); - } - public void RunLclVarScenario_UnsafeRead() { TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_UnsafeRead)); diff --git a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/ExtractVectorTest.template b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/ExtractVectorTest.template index 8a6127091ebf49..4f68894e4f394c 100644 --- a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/ExtractVectorTest.template +++ b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/ExtractVectorTest.template @@ -38,9 +38,6 @@ namespace JIT.HardwareIntrinsics.Arm // Validates calling via reflection works, using Unsafe.Read test.RunReflectionScenario_UnsafeRead(); - // Validates passing a static member works - test.RunClsVarScenario(); - // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); @@ -160,22 +157,11 @@ namespace JIT.HardwareIntrinsics.Arm private static {Op1BaseType}[] _data1 = new {Op1BaseType}[Op1ElementCount]; private static {Op2BaseType}[] _data2 = new {Op2BaseType}[Op2ElementCount]; - private static {Op1VectorType}<{Op1BaseType}> _clsVar1; - private static {Op2VectorType}<{Op2BaseType}> _clsVar2; - private {Op1VectorType}<{Op1BaseType}> _fld1; private {Op2VectorType}<{Op2BaseType}> _fld2; private DataTable _dataTable; - static ExtractVectorTest__{TestName}() - { - for (var i = 0; i < Op1ElementCount; i++) { _data1[i] = {NextValueOp1}; } - Unsafe.CopyBlockUnaligned(ref Unsafe.As<{Op1VectorType}<{Op1BaseType}>, byte>(ref _clsVar1), ref Unsafe.As<{Op1BaseType}, byte>(ref _data1[0]), (uint)Unsafe.SizeOf<{Op1VectorType}<{Op1BaseType}>>()); - for (var i = 0; i < Op2ElementCount; i++) { _data2[i] = {NextValueOp2}; } - Unsafe.CopyBlockUnaligned(ref Unsafe.As<{Op2VectorType}<{Op2BaseType}>, byte>(ref _clsVar2), ref Unsafe.As<{Op2BaseType}, byte>(ref _data2[0]), (uint)Unsafe.SizeOf<{Op2VectorType}<{Op2BaseType}>>()); - } - public ExtractVectorTest__{TestName}() { Succeeded = true; @@ -237,20 +223,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(_dataTable.inArray1Ptr, _dataTable.inArray2Ptr, _dataTable.outArrayPtr); } - public void RunClsVarScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario)); - - var result = {Isa}.{Method}( - _clsVar1, - _clsVar2, - ElementIndex - ); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(_clsVar1, _clsVar2, _dataTable.outArrayPtr); - } - public void RunLclVarScenario_UnsafeRead() { TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_UnsafeRead)); diff --git a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/InsertScalarTest.template b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/InsertScalarTest.template index 5b6c0ddb5a2a6b..7bdd479a1abcd6 100644 --- a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/InsertScalarTest.template +++ b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/InsertScalarTest.template @@ -38,9 +38,6 @@ namespace JIT.HardwareIntrinsics.Arm // Validates calling via reflection works, using Unsafe.Read test.RunReflectionScenario_UnsafeRead(); - // Validates passing a static member works - test.RunClsVarScenario(); - // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); @@ -160,22 +157,11 @@ namespace JIT.HardwareIntrinsics.Arm private static {Op1BaseType}[] _data1 = new {Op1BaseType}[Op1ElementCount]; private static {Op3BaseType}[] _data3 = new {Op3BaseType}[Op3ElementCount]; - private static {Op1VectorType}<{Op1BaseType}> _clsVar1; - private static {Op3VectorType}<{Op3BaseType}> _clsVar3; - private {Op1VectorType}<{Op1BaseType}> _fld1; private {Op3VectorType}<{Op3BaseType}> _fld3; private DataTable _dataTable; - static InsertScalarTest__{TestName}() - { - for (var i = 0; i < Op1ElementCount; i++) { _data1[i] = {NextValueOp1}; } - Unsafe.CopyBlockUnaligned(ref Unsafe.As<{Op1VectorType}<{Op1BaseType}>, byte>(ref _clsVar1), ref Unsafe.As<{Op1BaseType}, byte>(ref _data1[0]), (uint)Unsafe.SizeOf<{Op1VectorType}<{Op1BaseType}>>()); - for (var i = 0; i < Op3ElementCount; i++) { _data3[i] = {NextValueOp3}; } - Unsafe.CopyBlockUnaligned(ref Unsafe.As<{Op3VectorType}<{Op3BaseType}>, byte>(ref _clsVar3), ref Unsafe.As<{Op3BaseType}, byte>(ref _data3[0]), (uint)Unsafe.SizeOf<{Op3VectorType}<{Op3BaseType}>>()); - } - public InsertScalarTest__{TestName}() { Succeeded = true; @@ -237,20 +223,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(_dataTable.inArray1Ptr, _dataTable.inArray3Ptr, _dataTable.outArrayPtr); } - public void RunClsVarScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario)); - - var result = {Isa}.{Method}( - _clsVar1, - {ElementIndex}, - _clsVar3 - ); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(_clsVar1, _clsVar3, _dataTable.outArrayPtr); - } - public void RunLclVarScenario_UnsafeRead() { TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_UnsafeRead)); diff --git a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/InsertSelectedScalarTest.template b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/InsertSelectedScalarTest.template index 6ae12a694697a6..40df927f800429 100644 --- a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/InsertSelectedScalarTest.template +++ b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/InsertSelectedScalarTest.template @@ -38,9 +38,6 @@ namespace JIT.HardwareIntrinsics.Arm // Validates calling via reflection works, using Unsafe.Read test.RunReflectionScenario_UnsafeRead(); - // Validates passing a static member works - test.RunClsVarScenario(); - // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); @@ -161,22 +158,11 @@ namespace JIT.HardwareIntrinsics.Arm private static {Op1BaseType}[] _data1 = new {Op1BaseType}[Op1ElementCount]; private static {Op3BaseType}[] _data3 = new {Op3BaseType}[Op3ElementCount]; - private static {Op1VectorType}<{Op1BaseType}> _clsVar1; - private static {Op3VectorType}<{Op3BaseType}> _clsVar3; - private {Op1VectorType}<{Op1BaseType}> _fld1; private {Op3VectorType}<{Op3BaseType}> _fld3; private DataTable _dataTable; - static InsertSelectedScalarTest__{TestName}() - { - for (var i = 0; i < Op1ElementCount; i++) { _data1[i] = {NextValueOp1}; } - Unsafe.CopyBlockUnaligned(ref Unsafe.As<{Op1VectorType}<{Op1BaseType}>, byte>(ref _clsVar1), ref Unsafe.As<{Op1BaseType}, byte>(ref _data1[0]), (uint)Unsafe.SizeOf<{Op1VectorType}<{Op1BaseType}>>()); - for (var i = 0; i < Op3ElementCount; i++) { _data3[i] = {NextValueOp3}; } - Unsafe.CopyBlockUnaligned(ref Unsafe.As<{Op3VectorType}<{Op3BaseType}>, byte>(ref _clsVar3), ref Unsafe.As<{Op3BaseType}, byte>(ref _data3[0]), (uint)Unsafe.SizeOf<{Op3VectorType}<{Op3BaseType}>>()); - } - public InsertSelectedScalarTest__{TestName}() { Succeeded = true; @@ -241,21 +227,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(_dataTable.inArray1Ptr, _dataTable.inArray3Ptr, _dataTable.outArrayPtr); } - public void RunClsVarScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario)); - - var result = {Isa}.{Method}( - _clsVar1, - {ElementIndex1}, - _clsVar3, - {ElementIndex2} - ); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(_clsVar1, _clsVar3, _dataTable.outArrayPtr); - } - public void RunLclVarScenario_UnsafeRead() { TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_UnsafeRead)); diff --git a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/InsertTest.template b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/InsertTest.template index 43d7450e0f46ff..60c4d89251b2bd 100644 --- a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/InsertTest.template +++ b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/InsertTest.template @@ -38,9 +38,6 @@ namespace JIT.HardwareIntrinsics.Arm // Validates calling via reflection works, using Unsafe.Read test.RunReflectionScenario_UnsafeRead(); - // Validates passing a static member works - test.RunClsVarScenario(); - // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); @@ -150,22 +147,11 @@ namespace JIT.HardwareIntrinsics.Arm private static {Op1BaseType}[] _data1 = new {Op1BaseType}[Op1ElementCount]; - private static {Op1VectorType}<{Op1BaseType}> _clsVar1; - private static {Op1BaseType} _clsVar3; - private {Op1VectorType}<{Op1BaseType}> _fld1; private {Op1BaseType} _fld3; private DataTable _dataTable; - static InsertTest__{TestName}() - { - for (var i = 0; i < Op1ElementCount; i++) { _data1[i] = {NextValueOp1}; } - Unsafe.CopyBlockUnaligned(ref Unsafe.As<{Op1VectorType}<{Op1BaseType}>, byte>(ref _clsVar1), ref Unsafe.As<{Op1BaseType}, byte>(ref _data1[0]), (uint)Unsafe.SizeOf<{Op1VectorType}<{Op1BaseType}>>()); - - _clsVar3 = {NextValueOp3}; - } - public InsertTest__{TestName}() { Succeeded = true; @@ -228,20 +214,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(_dataTable.inArray1Ptr, op3, _dataTable.outArrayPtr); } - public void RunClsVarScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario)); - - var result = {Isa}.{Method}( - _clsVar1, - ElementIndex, - _clsVar3 - ); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(_clsVar1, _clsVar3, _dataTable.outArrayPtr); - } - public void RunLclVarScenario_UnsafeRead() { TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_UnsafeRead)); diff --git a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/LoadAndInsertScalarTest.template b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/LoadAndInsertScalarTest.template index a00c724302ef4d..2be19c885fc1b2 100644 --- a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/LoadAndInsertScalarTest.template +++ b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/LoadAndInsertScalarTest.template @@ -39,9 +39,6 @@ namespace JIT.HardwareIntrinsics.Arm // Validates calling via reflection works, using Unsafe.Read test.RunReflectionScenario_UnsafeRead(); - // Validates passing a static member works - test.RunClsVarScenario(); - // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); @@ -155,22 +152,11 @@ namespace JIT.HardwareIntrinsics.Arm private static {Op1BaseType}[] _data1 = new {Op1BaseType}[Op1ElementCount]; - private static {Op1VectorType}<{Op1BaseType}> _clsVar1; - private static {Op1BaseType} _clsVar3; - private {Op1VectorType}<{Op1BaseType}> _fld1; private {Op1BaseType} _fld3; private DataTable _dataTable; - static LoadAndInsertTest__{TestName}() - { - for (var i = 0; i < Op1ElementCount; i++) { _data1[i] = {NextValueOp1}; } - Unsafe.CopyBlockUnaligned(ref Unsafe.As<{Op1VectorType}<{Op1BaseType}>, byte>(ref _clsVar1), ref Unsafe.As<{Op1BaseType}, byte>(ref _data1[0]), (uint)Unsafe.SizeOf<{Op1VectorType}<{Op1BaseType}>>()); - - _clsVar3 = {NextValueOp3}; - } - public LoadAndInsertTest__{TestName}() { Succeeded = true; @@ -237,22 +223,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(_dataTable.inArray1Ptr, op3, _dataTable.outArrayPtr); } - public void RunClsVarScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario)); - - fixed ({Op1BaseType}* pClsVar3 = &_clsVar3) - { - var result = {Isa}.{Method}( - _clsVar1, - {ElementIndex}, - pClsVar3 - ); - Unsafe.Write(_dataTable.outArrayPtr, result); - } - ValidateResult(_clsVar1, _clsVar3, _dataTable.outArrayPtr); - } - public void RunLclVarScenario_UnsafeRead() { TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_UnsafeRead)); diff --git a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/LoadPairVectorTest.template b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/LoadPairVectorTest.template index a9cd9dd47966b7..f69de31a21333f 100644 --- a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/LoadPairVectorTest.template +++ b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/LoadPairVectorTest.template @@ -33,9 +33,6 @@ namespace JIT.HardwareIntrinsics.Arm // Validates calling via reflection works test.RunReflectionScenario(); - // Validates loading to a static member works - test.RunClsVarScenario(); - // Validates loading to the field of a local class works test.RunClassLclFldScenario(); @@ -131,8 +128,6 @@ namespace JIT.HardwareIntrinsics.Arm private static {Op1BaseType}[] _data = new {Op1BaseType}[Op1ElementCount]; - private static ({RetVectorType}<{RetBaseType}>,{RetVectorType}<{RetBaseType}>) _clsVar; - private ({RetVectorType}<{RetBaseType}>,{RetVectorType}<{RetBaseType}>) _fld; private DataTable _dataTable; @@ -171,16 +166,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(_dataTable.inArrayPtr, _dataTable.outArrayPtr); } - public void RunClsVarScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario)); - - _clsVar = {Isa}.{Method}(({Op1BaseType}*)(_dataTable.inArrayPtr)); - - Unsafe.Write(_dataTable.outArrayPtr, _clsVar); - ValidateResult(_dataTable.inArrayPtr, _dataTable.outArrayPtr); - } - public void RunClassLclFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario)); diff --git a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/ScalarBinOpTest.template b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/ScalarBinOpTest.template index 52e8ff92e588b1..c50d9023bcacb0 100644 --- a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/ScalarBinOpTest.template +++ b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/ScalarBinOpTest.template @@ -32,9 +32,6 @@ namespace JIT.HardwareIntrinsics.Arm // Validates calling via reflection works, using Unsafe.ReadUnaligned test.RunReflectionScenario_UnsafeRead(); - // Validates passing a static member works - test.RunClsVarScenario(); - // Validates passing a local works, using Unsafe.ReadUnaligned test.RunLclVarScenario_UnsafeRead(); @@ -90,18 +87,9 @@ namespace JIT.HardwareIntrinsics.Arm private static {Op1BaseType} _data1; private static {Op2BaseType} _data2; - private static {Op1BaseType} _clsVar1; - private static {Op2BaseType} _clsVar2; - private {Op1BaseType} _fld1; private {Op2BaseType} _fld2; - static ScalarBinaryOpTest__{TestName}() - { - _clsVar1 = {NextValueOp1}; - _clsVar2 = {NextValueOp2}; - } - public ScalarBinaryOpTest__{TestName}() { Succeeded = true; @@ -142,18 +130,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(_data1, _data2, ({RetBaseType})result); } - public void RunClsVarScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario)); - - var result = {Isa}.{Method}( - _clsVar1, - _clsVar2 - ); - - ValidateResult(_clsVar1, _clsVar2, result); - } - public void RunLclVarScenario_UnsafeRead() { TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_UnsafeRead)); diff --git a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/ScalarUnOpTest.template b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/ScalarUnOpTest.template index 96796751f9b284..df700566d5ef4d 100644 --- a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/ScalarUnOpTest.template +++ b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/ScalarUnOpTest.template @@ -32,9 +32,6 @@ namespace JIT.HardwareIntrinsics.Arm // Validates calling via reflection works, using Unsafe.ReadUnaligned test.RunReflectionScenario_UnsafeRead(); - // Validates passing a static member works - test.RunClsVarScenario(); - // Validates passing a local works, using Unsafe.ReadUnaligned test.RunLclVarScenario_UnsafeRead(); @@ -86,20 +83,13 @@ namespace JIT.HardwareIntrinsics.Arm private static {Op1BaseType} _data; - private static {Op1BaseType} _clsVar; - private {Op1BaseType} _fld; - static ScalarUnaryOpTest__{TestName}() - { - _clsVar = {NextValueOp1}; - } - public ScalarUnaryOpTest__{TestName}() { Succeeded = true; - + _fld = {NextValueOp1}; _data = {NextValueOp1}; } @@ -131,17 +121,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(_data, ({RetBaseType})result); } - public void RunClsVarScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario)); - - var result = {Isa}.{Method}( - _clsVar - ); - - ValidateResult(_clsVar, result); - } - public void RunLclVarScenario_UnsafeRead() { TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_UnsafeRead)); diff --git a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/StoreBinOpTest.template b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/StoreBinOpTest.template index 4424da7daea2dc..500b8b057ec9a4 100644 --- a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/StoreBinOpTest.template +++ b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/StoreBinOpTest.template @@ -39,9 +39,6 @@ namespace JIT.HardwareIntrinsics.Arm // Validates calling via reflection works, using Unsafe.Read test.RunReflectionScenario_UnsafeRead(); - // Validates passing a static member works - test.RunClsVarScenario(); - // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); @@ -159,22 +156,11 @@ namespace JIT.HardwareIntrinsics.Arm private static {Op1BaseType}[] _data1 = new {Op1BaseType}[Op1ElementCount]; private static {Op2BaseType}[] _data2 = new {Op2BaseType}[Op2ElementCount]; - private static {Op1VectorType}<{Op1BaseType}> _clsVar1; - private static {Op2VectorType}<{Op2BaseType}> _clsVar2; - private {Op1VectorType}<{Op1BaseType}> _fld1; private {Op2VectorType}<{Op2BaseType}> _fld2; private DataTable _dataTable; - static StoreBinaryOpTest__{TestName}() - { - for (var i = 0; i < Op1ElementCount; i++) { _data1[i] = {NextValueOp1}; } - Unsafe.CopyBlockUnaligned(ref Unsafe.As<{Op1VectorType}<{Op1BaseType}>, byte>(ref _clsVar1), ref Unsafe.As<{Op1BaseType}, byte>(ref _data1[0]), (uint)Unsafe.SizeOf<{Op1VectorType}<{Op1BaseType}>>()); - for (var i = 0; i < Op2ElementCount; i++) { _data2[i] = {NextValueOp2}; } - Unsafe.CopyBlockUnaligned(ref Unsafe.As<{Op2VectorType}<{Op2BaseType}>, byte>(ref _clsVar2), ref Unsafe.As<{Op2BaseType}, byte>(ref _data2[0]), (uint)Unsafe.SizeOf<{Op2VectorType}<{Op2BaseType}>>()); - } - public StoreBinaryOpTest__{TestName}() { Succeeded = true; @@ -231,15 +217,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(_dataTable.inArray1Ptr, _dataTable.inArray2Ptr, _dataTable.outArrayPtr); } - public void RunClsVarScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario)); - - {Isa}.{Method}(({RetBaseType}*)_dataTable.outArrayPtr, _clsVar1, _clsVar2); - - ValidateResult(_clsVar1, _clsVar2, _dataTable.outArrayPtr); - } - public void RunLclVarScenario_UnsafeRead() { TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_UnsafeRead)); diff --git a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/StoreSelectedScalarTest.template b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/StoreSelectedScalarTest.template index 6b98a16192dcd3..3a1268ce8e0140 100644 --- a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/StoreSelectedScalarTest.template +++ b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/StoreSelectedScalarTest.template @@ -39,9 +39,6 @@ namespace JIT.HardwareIntrinsics.Arm // Validates calling via reflection works, using Unsafe.Read test.RunReflectionScenario_UnsafeRead(); - // Validates passing a static member works - test.RunClsVarScenario(); - // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); @@ -147,18 +144,10 @@ namespace JIT.HardwareIntrinsics.Arm private static {Op1BaseType}[] _data1 = new {Op1BaseType}[Op1ElementCount]; - private static {Op1VectorType}<{Op1BaseType}> _clsVar1; - private {Op1VectorType}<{Op1BaseType}> _fld1; private DataTable _dataTable; - static StoreSelectedScalarTest__{TestName}() - { - for (var i = 0; i < Op1ElementCount; i++) { _data1[i] = {NextValueOp1}; } - Unsafe.CopyBlockUnaligned(ref Unsafe.As<{Op1VectorType}<{Op1BaseType}>, byte>(ref _clsVar1), ref Unsafe.As<{Op1BaseType}, byte>(ref _data1[0]), (uint)Unsafe.SizeOf<{Op1VectorType}<{Op1BaseType}>>()); - } - public StoreSelectedScalarTest__{TestName}() { Succeeded = true; @@ -205,15 +194,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(_dataTable.inArray1Ptr, _dataTable.outArrayPtr); } - public void RunClsVarScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario)); - - {Isa}.{Method}(({RetBaseType}*)_dataTable.outArrayPtr, _clsVar1, {ElementIndex}); - - ValidateResult(_clsVar1, _dataTable.outArrayPtr); - } - public void RunLclVarScenario_UnsafeRead() { TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_UnsafeRead)); diff --git a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/StoreUnOpTest.template b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/StoreUnOpTest.template index 0cbb6271f713f6..51498a39652a75 100644 --- a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/StoreUnOpTest.template +++ b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/StoreUnOpTest.template @@ -39,9 +39,6 @@ namespace JIT.HardwareIntrinsics.Arm // Validates calling via reflection works, using Unsafe.Read test.RunReflectionScenario_UnsafeRead(); - // Validates passing a static member works - test.RunClsVarScenario(); - // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); @@ -146,18 +143,10 @@ namespace JIT.HardwareIntrinsics.Arm private static {Op1BaseType}[] _data1 = new {Op1BaseType}[Op1ElementCount]; - private static {Op1VectorType}<{Op1BaseType}> _clsVar1; - private {Op1VectorType}<{Op1BaseType}> _fld1; private DataTable _dataTable; - static StoreUnaryOpTest__{TestName}() - { - for (var i = 0; i < Op1ElementCount; i++) { _data1[i] = {NextValueOp1}; } - Unsafe.CopyBlockUnaligned(ref Unsafe.As<{Op1VectorType}<{Op1BaseType}>, byte>(ref _clsVar1), ref Unsafe.As<{Op1BaseType}, byte>(ref _data1[0]), (uint)Unsafe.SizeOf<{Op1VectorType}<{Op1BaseType}>>()); - } - public StoreUnaryOpTest__{TestName}() { Succeeded = true; @@ -203,15 +192,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(_dataTable.inArray1Ptr, _dataTable.outArrayPtr); } - public void RunClsVarScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario)); - - {Isa}.{Method}(({RetBaseType}*)_dataTable.outArrayPtr, _clsVar1); - - ValidateResult(_clsVar1, _dataTable.outArrayPtr); - } - public void RunLclVarScenario_UnsafeRead() { TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_UnsafeRead)); diff --git a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/VectorLookupExtension_2Test.template b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/VectorLookupExtension_2Test.template index ff26478143df4a..703fa48c46bd80 100644 --- a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/VectorLookupExtension_2Test.template +++ b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/VectorLookupExtension_2Test.template @@ -17,7 +17,7 @@ using Xunit; namespace JIT.HardwareIntrinsics.Arm { public static partial class Program - { + { [Fact] public static void VectorLookupExtension_2_{RetBaseType}() { @@ -31,9 +31,6 @@ namespace JIT.HardwareIntrinsics.Arm // Validates calling via reflection works, using Unsafe.Read test.RunReflectionScenario_UnsafeRead(); - // Validates passing a static member works - test.RunClsVarScenario(); - // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); @@ -53,7 +50,7 @@ namespace JIT.HardwareIntrinsics.Arm { // Validates we throw on unsupported hardware test.RunUnsupportedScenario(); - } + } if (!test.Succeeded) { @@ -176,11 +173,6 @@ namespace JIT.HardwareIntrinsics.Arm private static {Op1BaseType}[] _data2 = new {Op1BaseType}[Op1ElementCount]; private static {Op2BaseType}[] _data3 = new {Op2BaseType}[Op1ElementCount]; - private static {Op2VectorType}<{Op2BaseType}> _clsVar0; - private static {Op1VectorType}<{Op1BaseType}> _clsVar1; - private static {Op1VectorType}<{Op1BaseType}> _clsVar2; - private static {Op2VectorType}<{Op2BaseType}> _clsVar3; - private {Op2VectorType}<{Op2BaseType}> _fld0; private {Op1VectorType}<{Op1BaseType}> _fld1; private {Op1VectorType}<{Op1BaseType}> _fld2; @@ -188,18 +180,6 @@ namespace JIT.HardwareIntrinsics.Arm private DataTable _dataTable; - static VectorLookupExtension_2Test__{Method}{RetBaseType}() - { - for (var i = 0; i < Op2ElementCount; i++) { _data0[i] = {NextValueOp0}; } - Unsafe.CopyBlockUnaligned(ref Unsafe.As<{Op2VectorType}<{Op2BaseType}>, byte>(ref _clsVar0), ref Unsafe.As<{Op2BaseType}, byte>(ref _data0[0]), (uint)Unsafe.SizeOf<{Op2VectorType}<{Op2BaseType}>>()); - for (var i = 0; i < Op1ElementCount; i++) { _data1[i] = {NextValueOp1}; } - Unsafe.CopyBlockUnaligned(ref Unsafe.As<{Op1VectorType}<{Op1BaseType}>, byte>(ref _clsVar1), ref Unsafe.As<{Op1BaseType}, byte>(ref _data1[0]), (uint)Unsafe.SizeOf<{Op1VectorType}<{Op1BaseType}>>()); - for (var i = 0; i < Op1ElementCount; i++) { _data2[i] = {NextValueOp1}; } - Unsafe.CopyBlockUnaligned(ref Unsafe.As<{Op1VectorType}<{Op1BaseType}>, byte>(ref _clsVar2), ref Unsafe.As<{Op1BaseType}, byte>(ref _data2[0]), (uint)Unsafe.SizeOf<{Op1VectorType}<{Op1BaseType}>>()); - for (var i = 0; i < Op2ElementCount; i++) { _data3[i] = {NextValueOp2}; } - Unsafe.CopyBlockUnaligned(ref Unsafe.As<{Op2VectorType}<{Op2BaseType}>, byte>(ref _clsVar3), ref Unsafe.As<{Op2BaseType}, byte>(ref _data3[0]), (uint)Unsafe.SizeOf<{Op2VectorType}<{Op2BaseType}>>()); - } - public VectorLookupExtension_2Test__{Method}{RetBaseType}() { Succeeded = true; @@ -221,7 +201,7 @@ namespace JIT.HardwareIntrinsics.Arm } public bool IsSupported => {Isa}.IsSupported; - + public bool Succeeded { get; set; } public void RunBasicScenario_UnsafeRead() @@ -264,21 +244,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(_dataTable.inArray0Ptr, _dataTable.inArray1Ptr, _dataTable.inArray2Ptr, _dataTable.inArray3Ptr, _dataTable.outArrayPtr); } - public void RunClsVarScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario)); - - var result = {Isa}.{Method}( - _clsVar0, - (_clsVar1, - _clsVar2), - _clsVar3 - ); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(_clsVar0, _clsVar1, _clsVar2, _clsVar3, _dataTable.outArrayPtr); - } - public void RunLclVarScenario_UnsafeRead() { TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_UnsafeRead)); @@ -352,7 +317,7 @@ namespace JIT.HardwareIntrinsics.Arm { Succeeded = false; } - } + } private void ValidateResult({Op2VectorType}<{Op2BaseType}> op0, {Op1VectorType}<{Op1BaseType}> op1, {Op1VectorType}<{Op1BaseType}> op2, {Op2VectorType}<{Op2BaseType}> op3, void* result, [CallerMemberName] string method = "") { diff --git a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/VectorLookupExtension_3Test.template b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/VectorLookupExtension_3Test.template index 490c6650893ca5..6f1b7def59b746 100644 --- a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/VectorLookupExtension_3Test.template +++ b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/VectorLookupExtension_3Test.template @@ -31,9 +31,6 @@ namespace JIT.HardwareIntrinsics.Arm // Validates calling via reflection works, using Unsafe.Read test.RunReflectionScenario_UnsafeRead(); - // Validates passing a static member works - test.RunClsVarScenario(); - // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); @@ -53,7 +50,7 @@ namespace JIT.HardwareIntrinsics.Arm { // Validates we throw on unsupported hardware test.RunUnsupportedScenario(); - } + } if (!test.Succeeded) { @@ -188,12 +185,6 @@ namespace JIT.HardwareIntrinsics.Arm private static {Op1BaseType}[] _data3 = new {Op1BaseType}[Op1ElementCount]; private static {Op2BaseType}[] _data4 = new {Op2BaseType}[Op2ElementCount]; - private static {Op2VectorType}<{Op2BaseType}> _clsVar0; - private static {Op1VectorType}<{Op1BaseType}> _clsVar1; - private static {Op1VectorType}<{Op1BaseType}> _clsVar2; - private static {Op1VectorType}<{Op1BaseType}> _clsVar3; - private static {Op2VectorType}<{Op2BaseType}> _clsVar4; - private {Op2VectorType}<{Op2BaseType}> _fld0; private {Op1VectorType}<{Op1BaseType}> _fld1; private {Op1VectorType}<{Op1BaseType}> _fld2; @@ -202,20 +193,6 @@ namespace JIT.HardwareIntrinsics.Arm private DataTable _dataTable; - static VectorLookupExtension_3Test__{Method}{RetBaseType}() - { - for (var i = 0; i < Op2ElementCount; i++) { _data0[i] = {NextValueOp0}; } - Unsafe.CopyBlockUnaligned(ref Unsafe.As<{Op2VectorType}<{Op2BaseType}>, byte>(ref _clsVar0), ref Unsafe.As<{Op2BaseType}, byte>(ref _data0[0]), (uint)Unsafe.SizeOf<{Op2VectorType}<{Op2BaseType}>>()); - for (var i = 0; i < Op1ElementCount; i++) { _data1[i] = {NextValueOp1}; } - Unsafe.CopyBlockUnaligned(ref Unsafe.As<{Op1VectorType}<{Op1BaseType}>, byte>(ref _clsVar1), ref Unsafe.As<{Op1BaseType}, byte>(ref _data1[0]), (uint)Unsafe.SizeOf<{Op1VectorType}<{Op1BaseType}>>()); - for (var i = 0; i < Op1ElementCount; i++) { _data2[i] = {NextValueOp1}; } - Unsafe.CopyBlockUnaligned(ref Unsafe.As<{Op1VectorType}<{Op1BaseType}>, byte>(ref _clsVar2), ref Unsafe.As<{Op1BaseType}, byte>(ref _data2[0]), (uint)Unsafe.SizeOf<{Op1VectorType}<{Op1BaseType}>>()); - for (var i = 0; i < Op1ElementCount; i++) { _data3[i] = {NextValueOp1}; } - Unsafe.CopyBlockUnaligned(ref Unsafe.As<{Op1VectorType}<{Op1BaseType}>, byte>(ref _clsVar3), ref Unsafe.As<{Op1BaseType}, byte>(ref _data3[0]), (uint)Unsafe.SizeOf<{Op1VectorType}<{Op1BaseType}>>()); - for (var i = 0; i < Op2ElementCount; i++) { _data4[i] = {NextValueOp2}; } - Unsafe.CopyBlockUnaligned(ref Unsafe.As<{Op2VectorType}<{Op2BaseType}>, byte>(ref _clsVar4), ref Unsafe.As<{Op2BaseType}, byte>(ref _data4[0]), (uint)Unsafe.SizeOf<{Op2VectorType}<{Op2BaseType}>>()); - } - public VectorLookupExtension_3Test__{Method}{RetBaseType}() { Succeeded = true; @@ -240,7 +217,7 @@ namespace JIT.HardwareIntrinsics.Arm } public bool IsSupported => {Isa}.IsSupported; - + public bool Succeeded { get; set; } public void RunBasicScenario_UnsafeRead() @@ -284,22 +261,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(_dataTable.inArray0Ptr, _dataTable.inArray1Ptr, _dataTable.inArray2Ptr, _dataTable.inArray3Ptr, _dataTable.inArray4Ptr, _dataTable.outArrayPtr); } - public void RunClsVarScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario)); - - var result = {Isa}.{Method}( - _clsVar0, - (_clsVar1, - _clsVar2, - _clsVar3), - _clsVar4 - ); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(_clsVar0, _clsVar1, _clsVar2, _clsVar3, _clsVar4, _dataTable.outArrayPtr); - } - public void RunLclVarScenario_UnsafeRead() { TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_UnsafeRead)); diff --git a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/VectorLookupExtension_4Test.template b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/VectorLookupExtension_4Test.template index 46e860ecc71fdb..04070807532c05 100644 --- a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/VectorLookupExtension_4Test.template +++ b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/VectorLookupExtension_4Test.template @@ -31,9 +31,6 @@ namespace JIT.HardwareIntrinsics.Arm // Validates calling via reflection works, using Unsafe.Read test.RunReflectionScenario_UnsafeRead(); - // Validates passing a static member works - test.RunClsVarScenario(); - // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); @@ -200,13 +197,6 @@ namespace JIT.HardwareIntrinsics.Arm private static {Op1BaseType}[] _data4 = new {Op1BaseType}[Op1ElementCount]; private static {Op2BaseType}[] _data5 = new {Op2BaseType}[Op2ElementCount]; - private static {Op2VectorType}<{Op2BaseType}> _clsVar0; - private static {Op1VectorType}<{Op1BaseType}> _clsVar1; - private static {Op1VectorType}<{Op1BaseType}> _clsVar2; - private static {Op1VectorType}<{Op1BaseType}> _clsVar3; - private static {Op1VectorType}<{Op1BaseType}> _clsVar4; - private static {Op2VectorType}<{Op2BaseType}> _clsVar5; - private {Op2VectorType}<{Op2BaseType}> _fld0; private {Op1VectorType}<{Op1BaseType}> _fld1; private {Op1VectorType}<{Op1BaseType}> _fld2; @@ -216,22 +206,6 @@ namespace JIT.HardwareIntrinsics.Arm private DataTable _dataTable; - static VectorLookupExtension_4Test__{Method}{RetBaseType}() - { - for (var i = 0; i < Op2ElementCount; i++) { _data0[i] = {NextValueOp0}; } - Unsafe.CopyBlockUnaligned(ref Unsafe.As<{Op2VectorType}<{Op2BaseType}>, byte>(ref _clsVar0), ref Unsafe.As<{Op2BaseType}, byte>(ref _data0[0]), (uint)Unsafe.SizeOf<{Op2VectorType}<{Op2BaseType}>>()); - for (var i = 0; i < Op1ElementCount; i++) { _data1[i] = {NextValueOp1}; } - Unsafe.CopyBlockUnaligned(ref Unsafe.As<{Op1VectorType}<{Op1BaseType}>, byte>(ref _clsVar1), ref Unsafe.As<{Op1BaseType}, byte>(ref _data1[0]), (uint)Unsafe.SizeOf<{Op1VectorType}<{Op1BaseType}>>()); - for (var i = 0; i < Op1ElementCount; i++) { _data2[i] = {NextValueOp1}; } - Unsafe.CopyBlockUnaligned(ref Unsafe.As<{Op1VectorType}<{Op1BaseType}>, byte>(ref _clsVar2), ref Unsafe.As<{Op1BaseType}, byte>(ref _data2[0]), (uint)Unsafe.SizeOf<{Op1VectorType}<{Op1BaseType}>>()); - for (var i = 0; i < Op1ElementCount; i++) { _data3[i] = {NextValueOp1}; } - Unsafe.CopyBlockUnaligned(ref Unsafe.As<{Op1VectorType}<{Op1BaseType}>, byte>(ref _clsVar3), ref Unsafe.As<{Op1BaseType}, byte>(ref _data3[0]), (uint)Unsafe.SizeOf<{Op1VectorType}<{Op1BaseType}>>()); - for (var i = 0; i < Op1ElementCount; i++) { _data4[i] = {NextValueOp1}; } - Unsafe.CopyBlockUnaligned(ref Unsafe.As<{Op1VectorType}<{Op1BaseType}>, byte>(ref _clsVar4), ref Unsafe.As<{Op1BaseType}, byte>(ref _data4[0]), (uint)Unsafe.SizeOf<{Op1VectorType}<{Op1BaseType}>>()); - for (var i = 0; i < Op2ElementCount; i++) { _data5[i] = {NextValueOp2}; } - Unsafe.CopyBlockUnaligned(ref Unsafe.As<{Op2VectorType}<{Op2BaseType}>, byte>(ref _clsVar5), ref Unsafe.As<{Op2BaseType}, byte>(ref _data5[0]), (uint)Unsafe.SizeOf<{Op2VectorType}<{Op2BaseType}>>()); - } - public VectorLookupExtension_4Test__{Method}{RetBaseType}() { Succeeded = true; @@ -259,7 +233,7 @@ namespace JIT.HardwareIntrinsics.Arm } public bool IsSupported => {Isa}.IsSupported; - + public bool Succeeded { get; set; } public void RunBasicScenario_UnsafeRead() @@ -304,23 +278,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(_dataTable.inArray0Ptr, _dataTable.inArray1Ptr, _dataTable.inArray2Ptr, _dataTable.inArray3Ptr, _dataTable.inArray4Ptr, _dataTable.inArray5Ptr, _dataTable.outArrayPtr); } - public void RunClsVarScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario)); - - var result = {Isa}.{Method}( - _clsVar0, - (_clsVar1, - _clsVar2, - _clsVar3, - _clsVar4), - _clsVar5 - ); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(_clsVar0, _clsVar1, _clsVar2, _clsVar3, _clsVar4, _clsVar5, _dataTable.outArrayPtr); - } - public void RunLclVarScenario_UnsafeRead() { TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_UnsafeRead)); diff --git a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/VectorLookup_2Test.template b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/VectorLookup_2Test.template index e68c67b1891713..e9684215a73225 100644 --- a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/VectorLookup_2Test.template +++ b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/VectorLookup_2Test.template @@ -31,9 +31,6 @@ namespace JIT.HardwareIntrinsics.Arm // Validates calling via reflection works, using Unsafe.Read test.RunReflectionScenario_UnsafeRead(); - // Validates passing a static member works - test.RunClsVarScenario(); - // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); @@ -48,7 +45,7 @@ namespace JIT.HardwareIntrinsics.Arm // Validates passing an instance member of a struct works test.RunStructFldScenario(); - } + } else { // Validates we throw on unsupported hardware @@ -164,26 +161,12 @@ namespace JIT.HardwareIntrinsics.Arm private static {Op1BaseType}[] _data2 = new {Op1BaseType}[Op1ElementCount]; private static {Op2BaseType}[] _data3 = new {Op2BaseType}[Op1ElementCount]; - private static {Op1VectorType}<{Op1BaseType}> _clsVar1; - private static {Op1VectorType}<{Op1BaseType}> _clsVar2; - private static {Op2VectorType}<{Op2BaseType}> _clsVar3; - private {Op1VectorType}<{Op1BaseType}> _fld1; private {Op1VectorType}<{Op1BaseType}> _fld2; private {Op2VectorType}<{Op2BaseType}> _fld3; private DataTable _dataTable; - static VectorLookup_2Test__{Method}{RetBaseType}() - { - for (var i = 0; i < Op1ElementCount; i++) { _data1[i] = {NextValueOp1}; } - Unsafe.CopyBlockUnaligned(ref Unsafe.As<{Op1VectorType}<{Op1BaseType}>, byte>(ref _clsVar1), ref Unsafe.As<{Op1BaseType}, byte>(ref _data1[0]), (uint)Unsafe.SizeOf<{Op1VectorType}<{Op1BaseType}>>()); - for (var i = 0; i < Op1ElementCount; i++) { _data2[i] = {NextValueOp1}; } - Unsafe.CopyBlockUnaligned(ref Unsafe.As<{Op1VectorType}<{Op1BaseType}>, byte>(ref _clsVar2), ref Unsafe.As<{Op1BaseType}, byte>(ref _data2[0]), (uint)Unsafe.SizeOf<{Op1VectorType}<{Op1BaseType}>>()); - for (var i = 0; i < Op2ElementCount; i++) { _data3[i] = {NextValueOp2}; } - Unsafe.CopyBlockUnaligned(ref Unsafe.As<{Op2VectorType}<{Op2BaseType}>, byte>(ref _clsVar3), ref Unsafe.As<{Op2BaseType}, byte>(ref _data3[0]), (uint)Unsafe.SizeOf<{Op2VectorType}<{Op2BaseType}>>()); - } - public VectorLookup_2Test__{Method}{RetBaseType}() { Succeeded = true; @@ -202,7 +185,7 @@ namespace JIT.HardwareIntrinsics.Arm } public bool IsSupported => {Isa}.IsSupported; - + public bool Succeeded { get; set; } public void RunBasicScenario_UnsafeRead() @@ -242,20 +225,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(_dataTable.inArray1Ptr, _dataTable.inArray2Ptr, _dataTable.inArray3Ptr, _dataTable.outArrayPtr); } - public void RunClsVarScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario)); - - var result = {Isa}.{Method}( - (_clsVar1, - _clsVar2), - _clsVar3 - ); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(_clsVar1, _clsVar2, _clsVar3, _dataTable.outArrayPtr); - } - public void RunLclVarScenario_UnsafeRead() { TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_UnsafeRead)); diff --git a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/VectorLookup_3Test.template b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/VectorLookup_3Test.template index b53282594a9931..02fee0f83db141 100644 --- a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/VectorLookup_3Test.template +++ b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/VectorLookup_3Test.template @@ -31,9 +31,6 @@ namespace JIT.HardwareIntrinsics.Arm // Validates calling via reflection works, using Unsafe.Read test.RunReflectionScenario_UnsafeRead(); - // Validates passing a static member works - test.RunClsVarScenario(); - // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); @@ -53,7 +50,7 @@ namespace JIT.HardwareIntrinsics.Arm { // Validates we throw on unsupported hardware test.RunUnsupportedScenario(); - } + } if (!test.Succeeded) { @@ -176,11 +173,6 @@ namespace JIT.HardwareIntrinsics.Arm private static {Op1BaseType}[] _data3 = new {Op1BaseType}[Op1ElementCount]; private static {Op2BaseType}[] _data4 = new {Op2BaseType}[Op2ElementCount]; - private static {Op1VectorType}<{Op1BaseType}> _clsVar1; - private static {Op1VectorType}<{Op1BaseType}> _clsVar2; - private static {Op1VectorType}<{Op1BaseType}> _clsVar3; - private static {Op2VectorType}<{Op2BaseType}> _clsVar4; - private {Op1VectorType}<{Op1BaseType}> _fld1; private {Op1VectorType}<{Op1BaseType}> _fld2; private {Op1VectorType}<{Op1BaseType}> _fld3; @@ -188,18 +180,6 @@ namespace JIT.HardwareIntrinsics.Arm private DataTable _dataTable; - static VectorLookup_3Test__{Method}{RetBaseType}() - { - for (var i = 0; i < Op1ElementCount; i++) { _data1[i] = {NextValueOp1}; } - Unsafe.CopyBlockUnaligned(ref Unsafe.As<{Op1VectorType}<{Op1BaseType}>, byte>(ref _clsVar1), ref Unsafe.As<{Op1BaseType}, byte>(ref _data1[0]), (uint)Unsafe.SizeOf<{Op1VectorType}<{Op1BaseType}>>()); - for (var i = 0; i < Op1ElementCount; i++) { _data2[i] = {NextValueOp1}; } - Unsafe.CopyBlockUnaligned(ref Unsafe.As<{Op1VectorType}<{Op1BaseType}>, byte>(ref _clsVar2), ref Unsafe.As<{Op1BaseType}, byte>(ref _data2[0]), (uint)Unsafe.SizeOf<{Op1VectorType}<{Op1BaseType}>>()); - for (var i = 0; i < Op1ElementCount; i++) { _data3[i] = {NextValueOp1}; } - Unsafe.CopyBlockUnaligned(ref Unsafe.As<{Op1VectorType}<{Op1BaseType}>, byte>(ref _clsVar3), ref Unsafe.As<{Op1BaseType}, byte>(ref _data3[0]), (uint)Unsafe.SizeOf<{Op1VectorType}<{Op1BaseType}>>()); - for (var i = 0; i < Op2ElementCount; i++) { _data4[i] = {NextValueOp2}; } - Unsafe.CopyBlockUnaligned(ref Unsafe.As<{Op2VectorType}<{Op2BaseType}>, byte>(ref _clsVar4), ref Unsafe.As<{Op2BaseType}, byte>(ref _data4[0]), (uint)Unsafe.SizeOf<{Op2VectorType}<{Op2BaseType}>>()); - } - public VectorLookup_3Test__{Method}{RetBaseType}() { Succeeded = true; @@ -221,7 +201,7 @@ namespace JIT.HardwareIntrinsics.Arm } public bool IsSupported => {Isa}.IsSupported; - + public bool Succeeded { get; set; } public void RunBasicScenario_UnsafeRead() @@ -262,21 +242,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(_dataTable.inArray1Ptr, _dataTable.inArray2Ptr, _dataTable.inArray3Ptr, _dataTable.inArray4Ptr, _dataTable.outArrayPtr); } - public void RunClsVarScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario)); - - var result = {Isa}.{Method}( - (_clsVar1, - _clsVar2, - _clsVar3), - _clsVar4 - ); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(_clsVar1, _clsVar2, _clsVar3, _clsVar4, _dataTable.outArrayPtr); - } - public void RunLclVarScenario_UnsafeRead() { TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_UnsafeRead)); @@ -350,7 +315,7 @@ namespace JIT.HardwareIntrinsics.Arm { Succeeded = false; } - } + } private void ValidateResult({Op1VectorType}<{Op1BaseType}> op1, {Op1VectorType}<{Op1BaseType}> op2, {Op1VectorType}<{Op1BaseType}> op3, {Op2VectorType}<{Op2BaseType}> op4, void* result, [CallerMemberName] string method = "") { diff --git a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/VectorLookup_4Test.template b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/VectorLookup_4Test.template index 1f2632a947a35f..fc50e937948477 100644 --- a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/VectorLookup_4Test.template +++ b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/VectorLookup_4Test.template @@ -24,16 +24,13 @@ namespace JIT.HardwareIntrinsics.Arm var test = new VectorLookup_4Test__{Method}{RetBaseType}(); if (test.IsSupported) - { + { // Validates basic functionality works, using Unsafe.Read test.RunBasicScenario_UnsafeRead(); // Validates calling via reflection works, using Unsafe.Read test.RunReflectionScenario_UnsafeRead(); - // Validates passing a static member works - test.RunClsVarScenario(); - // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); @@ -53,7 +50,7 @@ namespace JIT.HardwareIntrinsics.Arm { // Validates we throw on unsupported hardware test.RunUnsupportedScenario(); - } + } if (!test.Succeeded) { @@ -188,12 +185,6 @@ namespace JIT.HardwareIntrinsics.Arm private static {Op1BaseType}[] _data4 = new {Op1BaseType}[Op1ElementCount]; private static {Op2BaseType}[] _data5 = new {Op2BaseType}[Op2ElementCount]; - private static {Op1VectorType}<{Op1BaseType}> _clsVar1; - private static {Op1VectorType}<{Op1BaseType}> _clsVar2; - private static {Op1VectorType}<{Op1BaseType}> _clsVar3; - private static {Op1VectorType}<{Op1BaseType}> _clsVar4; - private static {Op2VectorType}<{Op2BaseType}> _clsVar5; - private {Op1VectorType}<{Op1BaseType}> _fld1; private {Op1VectorType}<{Op1BaseType}> _fld2; private {Op1VectorType}<{Op1BaseType}> _fld3; @@ -202,20 +193,6 @@ namespace JIT.HardwareIntrinsics.Arm private DataTable _dataTable; - static VectorLookup_4Test__{Method}{RetBaseType}() - { - for (var i = 0; i < Op1ElementCount; i++) { _data1[i] = {NextValueOp1}; } - Unsafe.CopyBlockUnaligned(ref Unsafe.As<{Op1VectorType}<{Op1BaseType}>, byte>(ref _clsVar1), ref Unsafe.As<{Op1BaseType}, byte>(ref _data1[0]), (uint)Unsafe.SizeOf<{Op1VectorType}<{Op1BaseType}>>()); - for (var i = 0; i < Op1ElementCount; i++) { _data2[i] = {NextValueOp1}; } - Unsafe.CopyBlockUnaligned(ref Unsafe.As<{Op1VectorType}<{Op1BaseType}>, byte>(ref _clsVar2), ref Unsafe.As<{Op1BaseType}, byte>(ref _data2[0]), (uint)Unsafe.SizeOf<{Op1VectorType}<{Op1BaseType}>>()); - for (var i = 0; i < Op1ElementCount; i++) { _data3[i] = {NextValueOp1}; } - Unsafe.CopyBlockUnaligned(ref Unsafe.As<{Op1VectorType}<{Op1BaseType}>, byte>(ref _clsVar3), ref Unsafe.As<{Op1BaseType}, byte>(ref _data3[0]), (uint)Unsafe.SizeOf<{Op1VectorType}<{Op1BaseType}>>()); - for (var i = 0; i < Op1ElementCount; i++) { _data4[i] = {NextValueOp1}; } - Unsafe.CopyBlockUnaligned(ref Unsafe.As<{Op1VectorType}<{Op1BaseType}>, byte>(ref _clsVar4), ref Unsafe.As<{Op1BaseType}, byte>(ref _data4[0]), (uint)Unsafe.SizeOf<{Op1VectorType}<{Op1BaseType}>>()); - for (var i = 0; i < Op2ElementCount; i++) { _data5[i] = {NextValueOp2}; } - Unsafe.CopyBlockUnaligned(ref Unsafe.As<{Op2VectorType}<{Op2BaseType}>, byte>(ref _clsVar5), ref Unsafe.As<{Op2BaseType}, byte>(ref _data5[0]), (uint)Unsafe.SizeOf<{Op2VectorType}<{Op2BaseType}>>()); - } - public VectorLookup_4Test__{Method}{RetBaseType}() { Succeeded = true; @@ -240,7 +217,7 @@ namespace JIT.HardwareIntrinsics.Arm } public bool IsSupported => {Isa}.IsSupported; - + public bool Succeeded { get; set; } public void RunBasicScenario_UnsafeRead() @@ -282,22 +259,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(_dataTable.inArray1Ptr, _dataTable.inArray2Ptr, _dataTable.inArray3Ptr, _dataTable.inArray4Ptr, _dataTable.inArray5Ptr, _dataTable.outArrayPtr); } - public void RunClsVarScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario)); - - var result = {Isa}.{Method}( - (_clsVar1, - _clsVar2, - _clsVar3, - _clsVar4), - _clsVar5 - ); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(_clsVar1, _clsVar2, _clsVar3, _clsVar4, _clsVar5, _dataTable.outArrayPtr); - } - public void RunLclVarScenario_UnsafeRead() { TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_UnsafeRead)); @@ -372,7 +333,7 @@ namespace JIT.HardwareIntrinsics.Arm { Succeeded = false; } - } + } private void ValidateResult({Op1VectorType}<{Op1BaseType}> op1, {Op1VectorType}<{Op1BaseType}> op2, {Op1VectorType}<{Op1BaseType}> op3, {Op1VectorType}<{Op1BaseType}> op4, {Op2VectorType}<{Op2BaseType}> op5, void* result, [CallerMemberName] string method = "") { diff --git a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/_BinaryOpTestTemplate.template b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/_BinaryOpTestTemplate.template index a48ad3d30cba25..41b7fbba6a3d30 100644 --- a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/_BinaryOpTestTemplate.template +++ b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/_BinaryOpTestTemplate.template @@ -38,9 +38,6 @@ namespace JIT.HardwareIntrinsics.Arm // Validates calling via reflection works, using Unsafe.Read test.RunReflectionScenario_UnsafeRead(); - // Validates passing a static member works - test.RunClsVarScenario(); - // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); @@ -159,22 +156,11 @@ namespace JIT.HardwareIntrinsics.Arm private static {Op1BaseType}[] _data1 = new {Op1BaseType}[Op1ElementCount]; private static {Op2BaseType}[] _data2 = new {Op2BaseType}[Op2ElementCount]; - private static {Op1VectorType}<{Op1BaseType}> _clsVar1; - private static {Op2VectorType}<{Op2BaseType}> _clsVar2; - private {Op1VectorType}<{Op1BaseType}> _fld1; private {Op2VectorType}<{Op2BaseType}> _fld2; private DataTable _dataTable; - static {TemplateName}BinaryOpTest__{TestName}() - { - for (var i = 0; i < Op1ElementCount; i++) { _data1[i] = {NextValueOp1}; } - Unsafe.CopyBlockUnaligned(ref Unsafe.As<{Op1VectorType}<{Op1BaseType}>, byte>(ref _clsVar1), ref Unsafe.As<{Op1BaseType}, byte>(ref _data1[0]), (uint)Unsafe.SizeOf<{Op1VectorType}<{Op1BaseType}>>()); - for (var i = 0; i < Op2ElementCount; i++) { _data2[i] = {NextValueOp2}; } - Unsafe.CopyBlockUnaligned(ref Unsafe.As<{Op2VectorType}<{Op2BaseType}>, byte>(ref _clsVar2), ref Unsafe.As<{Op2BaseType}, byte>(ref _data2[0]), (uint)Unsafe.SizeOf<{Op2VectorType}<{Op2BaseType}>>()); - } - public {TemplateName}BinaryOpTest__{TestName}() { Succeeded = true; @@ -233,19 +219,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(_dataTable.inArray1Ptr, _dataTable.inArray2Ptr, _dataTable.outArrayPtr); } - public void RunClsVarScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario)); - - var result = {Isa}.{Method}( - _clsVar1, - _clsVar2 - ); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(_clsVar1, _clsVar2, _dataTable.outArrayPtr); - } - public void RunLclVarScenario_UnsafeRead() { TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_UnsafeRead)); diff --git a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/_ImmBinaryOpTestTemplate.template b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/_ImmBinaryOpTestTemplate.template index 661973b069f462..a1e14b507bfbc9 100644 --- a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/_ImmBinaryOpTestTemplate.template +++ b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/_ImmBinaryOpTestTemplate.template @@ -38,9 +38,6 @@ namespace JIT.HardwareIntrinsics.Arm // Validates calling via reflection works, using Unsafe.Read test.RunReflectionScenario_UnsafeRead(); - // Validates passing a static member works - test.RunClsVarScenario(); - // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); @@ -160,22 +157,11 @@ namespace JIT.HardwareIntrinsics.Arm private static {Op1BaseType}[] _data1 = new {Op1BaseType}[Op1ElementCount]; private static {Op2BaseType}[] _data2 = new {Op2BaseType}[Op2ElementCount]; - private static {Op1VectorType}<{Op1BaseType}> _clsVar1; - private static {Op2VectorType}<{Op2BaseType}> _clsVar2; - private {Op1VectorType}<{Op1BaseType}> _fld1; private {Op2VectorType}<{Op2BaseType}> _fld2; private DataTable _dataTable; - static ImmBinaryOpTest__{TestName}() - { - for (var i = 0; i < Op1ElementCount; i++) { _data1[i] = {NextValueOp1}; } - Unsafe.CopyBlockUnaligned(ref Unsafe.As<{Op1VectorType}<{Op1BaseType}>, byte>(ref _clsVar1), ref Unsafe.As<{Op1BaseType}, byte>(ref _data1[0]), (uint)Unsafe.SizeOf<{Op1VectorType}<{Op1BaseType}>>()); - for (var i = 0; i < Op2ElementCount; i++) { _data2[i] = {NextValueOp2}; } - Unsafe.CopyBlockUnaligned(ref Unsafe.As<{Op2VectorType}<{Op2BaseType}>, byte>(ref _clsVar2), ref Unsafe.As<{Op2BaseType}, byte>(ref _data2[0]), (uint)Unsafe.SizeOf<{Op2VectorType}<{Op2BaseType}>>()); - } - public ImmBinaryOpTest__{TestName}() { Succeeded = true; @@ -237,20 +223,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(_dataTable.inArray1Ptr, _dataTable.inArray2Ptr, _dataTable.outArrayPtr); } - public void RunClsVarScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario)); - - var result = {Isa}.{Method}( - _clsVar1, - _clsVar2, - {Imm} - ); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(_clsVar1, _clsVar2, _dataTable.outArrayPtr); - } - public void RunLclVarScenario_UnsafeRead() { TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_UnsafeRead)); diff --git a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/_ImmTernaryOpTestTemplate.template b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/_ImmTernaryOpTestTemplate.template index 0e707789699108..a141246d0b8392 100644 --- a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/_ImmTernaryOpTestTemplate.template +++ b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/_ImmTernaryOpTestTemplate.template @@ -38,9 +38,6 @@ namespace JIT.HardwareIntrinsics.Arm // Validates calling via reflection works, using Unsafe.Read test.RunReflectionScenario_UnsafeRead(); - // Validates passing a static member works - test.RunClsVarScenario(); - // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); @@ -173,26 +170,12 @@ namespace JIT.HardwareIntrinsics.Arm private static {Op2BaseType}[] _data2 = new {Op2BaseType}[Op2ElementCount]; private static {Op3BaseType}[] _data3 = new {Op3BaseType}[Op3ElementCount]; - private static {Op1VectorType}<{Op1BaseType}> _clsVar1; - private static {Op2VectorType}<{Op2BaseType}> _clsVar2; - private static {Op3VectorType}<{Op3BaseType}> _clsVar3; - private {Op1VectorType}<{Op1BaseType}> _fld1; private {Op2VectorType}<{Op2BaseType}> _fld2; private {Op3VectorType}<{Op3BaseType}> _fld3; private DataTable _dataTable; - static {TemplateName}TernaryOpTest__{TestName}() - { - for (var i = 0; i < Op1ElementCount; i++) { _data1[i] = {NextValueOp1}; } - Unsafe.CopyBlockUnaligned(ref Unsafe.As<{Op1VectorType}<{Op1BaseType}>, byte>(ref _clsVar1), ref Unsafe.As<{Op1BaseType}, byte>(ref _data1[0]), (uint)Unsafe.SizeOf<{Op1VectorType}<{Op1BaseType}>>()); - for (var i = 0; i < Op2ElementCount; i++) { _data2[i] = {NextValueOp2}; } - Unsafe.CopyBlockUnaligned(ref Unsafe.As<{Op2VectorType}<{Op2BaseType}>, byte>(ref _clsVar2), ref Unsafe.As<{Op2BaseType}, byte>(ref _data2[0]), (uint)Unsafe.SizeOf<{Op2VectorType}<{Op2BaseType}>>()); - for (var i = 0; i < Op3ElementCount; i++) { _data3[i] = {NextValueOp3}; } - Unsafe.CopyBlockUnaligned(ref Unsafe.As<{Op3VectorType}<{Op3BaseType}>, byte>(ref _clsVar3), ref Unsafe.As<{Op3BaseType}, byte>(ref _data3[0]), (uint)Unsafe.SizeOf<{Op3VectorType}<{Op3BaseType}>>()); - } - public {TemplateName}TernaryOpTest__{TestName}() { Succeeded = true; @@ -260,21 +243,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(_dataTable.inArray1Ptr, _dataTable.inArray2Ptr, _dataTable.inArray3Ptr, _dataTable.outArrayPtr); } - public void RunClsVarScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario)); - - var result = {Isa}.{Method}( - _clsVar1, - _clsVar2, - _clsVar3, - {Imm} - ); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(_clsVar1, _clsVar2, _clsVar3, _dataTable.outArrayPtr); - } - public void RunLclVarScenario_UnsafeRead() { TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_UnsafeRead)); diff --git a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/_ImmUnaryOpTestTemplate.template b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/_ImmUnaryOpTestTemplate.template index 852899beec5704..b6733ad81061ba 100644 --- a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/_ImmUnaryOpTestTemplate.template +++ b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/_ImmUnaryOpTestTemplate.template @@ -38,9 +38,6 @@ namespace JIT.HardwareIntrinsics.Arm // Validates calling via reflection works, using Unsafe.Read test.RunReflectionScenario_UnsafeRead(); - // Validates passing a static member works - test.RunClsVarScenario(); - // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); @@ -147,18 +144,10 @@ namespace JIT.HardwareIntrinsics.Arm private static {Op1BaseType}[] _data = new {Op1BaseType}[Op1ElementCount]; - private static {Op1VectorType}<{Op1BaseType}> _clsVar; - private {Op1VectorType}<{Op1BaseType}> _fld; private DataTable _dataTable; - static {TemplateName}UnaryOpTest__{TestName}() - { - for (var i = 0; i < Op1ElementCount; i++) { _data[i] = {NextValueOp1}; } - Unsafe.CopyBlockUnaligned(ref Unsafe.As<{Op1VectorType}<{Op1BaseType}>, byte>(ref _clsVar), ref Unsafe.As<{Op1BaseType}, byte>(ref _data[0]), (uint)Unsafe.SizeOf<{Op1VectorType}<{Op1BaseType}>>()); - } - public {TemplateName}UnaryOpTest__{TestName}() { Succeeded = true; @@ -214,19 +203,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(_dataTable.inArrayPtr, _dataTable.outArrayPtr); } - public void RunClsVarScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario)); - - var result = {Isa}.{Method}( - _clsVar, - {Imm} - ); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(_clsVar, _dataTable.outArrayPtr); - } - public void RunLclVarScenario_UnsafeRead() { TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_UnsafeRead)); diff --git a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/_TernaryOpTestTemplate.template b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/_TernaryOpTestTemplate.template index 4c794ff6eb56dd..316fa6084fa084 100644 --- a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/_TernaryOpTestTemplate.template +++ b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/_TernaryOpTestTemplate.template @@ -38,9 +38,6 @@ namespace JIT.HardwareIntrinsics.Arm // Validates calling via reflection works, using Unsafe.Read test.RunReflectionScenario_UnsafeRead(); - // Validates passing a static member works - test.RunClsVarScenario(); - // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); @@ -172,26 +169,12 @@ namespace JIT.HardwareIntrinsics.Arm private static {Op2BaseType}[] _data2 = new {Op2BaseType}[Op2ElementCount]; private static {Op3BaseType}[] _data3 = new {Op3BaseType}[Op3ElementCount]; - private static {Op1VectorType}<{Op1BaseType}> _clsVar1; - private static {Op2VectorType}<{Op2BaseType}> _clsVar2; - private static {Op3VectorType}<{Op3BaseType}> _clsVar3; - private {Op1VectorType}<{Op1BaseType}> _fld1; private {Op2VectorType}<{Op2BaseType}> _fld2; private {Op3VectorType}<{Op3BaseType}> _fld3; private DataTable _dataTable; - static {TemplateName}TernaryOpTest__{TestName}() - { - for (var i = 0; i < Op1ElementCount; i++) { _data1[i] = {NextValueOp1}; } - Unsafe.CopyBlockUnaligned(ref Unsafe.As<{Op1VectorType}<{Op1BaseType}>, byte>(ref _clsVar1), ref Unsafe.As<{Op1BaseType}, byte>(ref _data1[0]), (uint)Unsafe.SizeOf<{Op1VectorType}<{Op1BaseType}>>()); - for (var i = 0; i < Op2ElementCount; i++) { _data2[i] = {NextValueOp2}; } - Unsafe.CopyBlockUnaligned(ref Unsafe.As<{Op2VectorType}<{Op2BaseType}>, byte>(ref _clsVar2), ref Unsafe.As<{Op2BaseType}, byte>(ref _data2[0]), (uint)Unsafe.SizeOf<{Op2VectorType}<{Op2BaseType}>>()); - for (var i = 0; i < Op3ElementCount; i++) { _data3[i] = {NextValueOp3}; } - Unsafe.CopyBlockUnaligned(ref Unsafe.As<{Op3VectorType}<{Op3BaseType}>, byte>(ref _clsVar3), ref Unsafe.As<{Op3BaseType}, byte>(ref _data3[0]), (uint)Unsafe.SizeOf<{Op3VectorType}<{Op3BaseType}>>()); - } - public {TemplateName}TernaryOpTest__{TestName}() { Succeeded = true; @@ -256,20 +239,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(_dataTable.inArray1Ptr, _dataTable.inArray2Ptr, _dataTable.inArray3Ptr, _dataTable.outArrayPtr); } - public void RunClsVarScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario)); - - var result = {Isa}.{Method}( - _clsVar1, - _clsVar2, - _clsVar3 - ); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(_clsVar1, _clsVar2, _clsVar3, _dataTable.outArrayPtr); - } - public void RunLclVarScenario_UnsafeRead() { TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_UnsafeRead)); diff --git a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/_UnaryOpScalarTestTemplate.template b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/_UnaryOpScalarTestTemplate.template index 6fb9262397ec59..dc461ababdbeae 100644 --- a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/_UnaryOpScalarTestTemplate.template +++ b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/_UnaryOpScalarTestTemplate.template @@ -32,9 +32,6 @@ namespace JIT.HardwareIntrinsics.Arm // Validates calling via reflection works, using Unsafe.ReadUnaligned test.RunReflectionScenario_UnsafeRead(); - // Validates passing a static member works - test.RunClsVarScenario(); - // Validates passing a local works, using Unsafe.ReadUnaligned test.RunLclVarScenario_UnsafeRead(); @@ -126,17 +123,10 @@ namespace JIT.HardwareIntrinsics.Arm private static {Op1BaseType} _data; - private static {Op1BaseType} _clsVar; - private {Op1BaseType} _fld; private DataTable _dataTable; - static {TemplateName}UnaryOpTest__{TestName}() - { - _clsVar = {NextValueOp1}; - } - public {TemplateName}UnaryOpTest__{TestName}() { Succeeded = true; @@ -176,18 +166,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(_data, _dataTable.outArrayPtr); } - public void RunClsVarScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario)); - - var result = {Isa}.{Method}( - _clsVar - ); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(_clsVar, _dataTable.outArrayPtr); - } - public void RunLclVarScenario_UnsafeRead() { TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_UnsafeRead)); diff --git a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/_UnaryOpTestTemplate.template b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/_UnaryOpTestTemplate.template index 8282bfb12b1533..44fe5dbaf74bda 100644 --- a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/_UnaryOpTestTemplate.template +++ b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/_UnaryOpTestTemplate.template @@ -38,9 +38,6 @@ namespace JIT.HardwareIntrinsics.Arm // Validates calling via reflection works, using Unsafe.Read test.RunReflectionScenario_UnsafeRead(); - // Validates passing a static member works - test.RunClsVarScenario(); - // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); @@ -146,18 +143,10 @@ namespace JIT.HardwareIntrinsics.Arm private static {Op1BaseType}[] _data1 = new {Op1BaseType}[Op1ElementCount]; - private static {Op1VectorType}<{Op1BaseType}> _clsVar1; - private {Op1VectorType}<{Op1BaseType}> _fld1; private DataTable _dataTable; - static {TemplateName}UnaryOpTest__{TestName}() - { - for (var i = 0; i < Op1ElementCount; i++) { _data1[i] = {NextValueOp1}; } - Unsafe.CopyBlockUnaligned(ref Unsafe.As<{Op1VectorType}<{Op1BaseType}>, byte>(ref _clsVar1), ref Unsafe.As<{Op1BaseType}, byte>(ref _data1[0]), (uint)Unsafe.SizeOf<{Op1VectorType}<{Op1BaseType}>>()); - } - public {TemplateName}UnaryOpTest__{TestName}() { Succeeded = true; @@ -210,18 +199,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(_dataTable.inArray1Ptr, _dataTable.outArrayPtr); } - public void RunClsVarScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario)); - - var result = {Isa}.{Method}( - _clsVar1 - ); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(_clsVar1, _dataTable.outArrayPtr); - } - public void RunLclVarScenario_UnsafeRead() { TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_UnsafeRead)); diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Shared/AesBinOpTest.template b/src/tests/JIT/HardwareIntrinsics/X86/Shared/AesBinOpTest.template index d971c437783525..4a03ec5058924f 100644 --- a/src/tests/JIT/HardwareIntrinsics/X86/Shared/AesBinOpTest.template +++ b/src/tests/JIT/HardwareIntrinsics/X86/Shared/AesBinOpTest.template @@ -41,9 +41,6 @@ namespace JIT.HardwareIntrinsics.X86 // Validates calling via reflection works, using Unsafe.Read test.RunReflectionScenario_UnsafeRead(); - // Validates passing a static member works - test.RunClsVarScenario(); - // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); @@ -102,28 +99,17 @@ namespace JIT.HardwareIntrinsics.X86 private static readonly int LargestVectorSize = {LargestVectorSize}; private static readonly int RetElementCount = Unsafe.SizeOf<{RetVectorType}<{RetBaseType}>>() / sizeof({RetBaseType}); - + private static {Op1BaseType}[] _data1 = new {Op1BaseType}[{InputSize}] {Input}; private static {Op2BaseType}[] _data2 = new {Op2BaseType}[{KeySize}] {Key}; private static {RetBaseType}[] _expectedRet = new {RetBaseType}[{ExpectedRetSize}] {ExpectedRet}; - private static {Op1VectorType}<{Op1BaseType}> _clsVar1; - private static {Op2VectorType}<{Op2BaseType}> _clsVar2; - private {Op1VectorType}<{Op1BaseType}> _fld1; private {Op2VectorType}<{Op2BaseType}> _fld2; private SimpleBinaryOpTest__DataTable<{RetBaseType}, {Op1BaseType}, {Op2BaseType}> _dataTable; - static AesBinaryOpTest__{Method}{RetBaseType}() - { - - Unsafe.CopyBlockUnaligned(ref Unsafe.As<{Op1VectorType}<{Op1BaseType}>, byte>(ref _clsVar1), ref Unsafe.As<{Op1BaseType}, byte>(ref _data1[0]), (uint)Unsafe.SizeOf<{Op1VectorType}<{Op1BaseType}>>()); - - Unsafe.CopyBlockUnaligned(ref Unsafe.As<{Op2VectorType}<{Op2BaseType}>, byte>(ref _clsVar2), ref Unsafe.As<{Op2BaseType}, byte>(ref _data2[0]), (uint)Unsafe.SizeOf<{Op2VectorType}<{Op2BaseType}>>()); - } - public AesBinaryOpTest__{Method}{RetBaseType}() { Succeeded = true; @@ -192,19 +178,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(_dataTable.outArrayPtr); } - public void RunClsVarScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario)); - - var result = {Isa}.{Method}( - _clsVar1, - _clsVar2 - ); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(_dataTable.outArrayPtr); - } - public void RunLclVarScenario_UnsafeRead() { TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_UnsafeRead)); @@ -288,7 +261,7 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(outArray, method); } - + private void ValidateResult({RetBaseType}[] result, [CallerMemberName] string method = "") { bool succeeded = true; @@ -298,7 +271,7 @@ namespace JIT.HardwareIntrinsics.X86 if (result[i] != _expectedRet[i] ) { succeeded = false; - } + } } if (!succeeded) diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Shared/AesImmOpTest.template b/src/tests/JIT/HardwareIntrinsics/X86/Shared/AesImmOpTest.template index 985cd288083d5f..ac304b752012fc 100644 --- a/src/tests/JIT/HardwareIntrinsics/X86/Shared/AesImmOpTest.template +++ b/src/tests/JIT/HardwareIntrinsics/X86/Shared/AesImmOpTest.template @@ -41,9 +41,6 @@ namespace JIT.HardwareIntrinsics.X86 // Validates calling via reflection works, using Unsafe.Read test.RunReflectionScenario_UnsafeRead(); - // Validates passing a static member works - test.RunClsVarScenario(); - // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); @@ -103,18 +100,10 @@ namespace JIT.HardwareIntrinsics.X86 private static {Op1BaseType}[] _data = new {Op1BaseType}[{InputSize}] {Input}; private static {RetBaseType}[] _expectedRet = new {RetBaseType}[{ExpectedRetSize}] {ExpectedRet}; - private static {Op1VectorType}<{Op1BaseType}> _clsVar; - private {Op1VectorType}<{Op1BaseType}> _fld; private SimpleUnaryOpTest__DataTable<{RetBaseType}, {Op1BaseType}> _dataTable; - static AesImmOpTest__{Method}{RetBaseType}{Imm}() - { - - Unsafe.CopyBlockUnaligned(ref Unsafe.As<{Op1VectorType}<{Op1BaseType}>, byte>(ref _clsVar), ref Unsafe.As<{Op1BaseType}, byte>(ref _data[0]), (uint)Unsafe.SizeOf<{Op1VectorType}<{Op1BaseType}>>()); - } - public AesImmOpTest__{Method}{RetBaseType}{Imm}() { Succeeded = true; @@ -182,19 +171,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(_dataTable.outArrayPtr); } - public void RunClsVarScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario)); - - var result = {Isa}.{Method}( - _clsVar, - {Imm} - ); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(_dataTable.outArrayPtr); - } - public void RunLclVarScenario_UnsafeRead() { TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_UnsafeRead)); diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Shared/AesUnOpTest.template b/src/tests/JIT/HardwareIntrinsics/X86/Shared/AesUnOpTest.template index 38761b77b340d4..1df632a21c66b4 100644 --- a/src/tests/JIT/HardwareIntrinsics/X86/Shared/AesUnOpTest.template +++ b/src/tests/JIT/HardwareIntrinsics/X86/Shared/AesUnOpTest.template @@ -41,9 +41,6 @@ namespace JIT.HardwareIntrinsics.X86 // Validates calling via reflection works, using Unsafe.Read test.RunReflectionScenario_UnsafeRead(); - // Validates passing a static member works - test.RunClsVarScenario(); - // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); @@ -102,19 +99,11 @@ namespace JIT.HardwareIntrinsics.X86 private static {Op1BaseType}[] _data = new {Op1BaseType}[{InputSize}] {Input}; private static {RetBaseType}[] _expectedRet = new {RetBaseType}[{ExpectedRetSize}] {ExpectedRet}; - - private static {Op1VectorType}<{Op1BaseType}> _clsVar; private {Op1VectorType}<{Op1BaseType}> _fld; private SimpleUnaryOpTest__DataTable<{RetBaseType}, {Op1BaseType}> _dataTable; - static AesUnaryOpTest__{Method}{RetBaseType}() - { - - Unsafe.CopyBlockUnaligned(ref Unsafe.As<{Op1VectorType}<{Op1BaseType}>, byte>(ref _clsVar), ref Unsafe.As<{Op1BaseType}, byte>(ref _data[0]), (uint)Unsafe.SizeOf<{Op1VectorType}<{Op1BaseType}>>()); - } - public AesUnaryOpTest__{Method}{RetBaseType}() { Succeeded = true; @@ -178,18 +167,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(_dataTable.outArrayPtr); } - public void RunClsVarScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario)); - - var result = {Isa}.{Method}( - _clsVar - ); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(_dataTable.outArrayPtr); - } - public void RunLclVarScenario_UnsafeRead() { TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_UnsafeRead)); diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Shared/ExtractScalarTest.template b/src/tests/JIT/HardwareIntrinsics/X86/Shared/ExtractScalarTest.template index bff882cb4df295..67a0761f23cb5a 100644 --- a/src/tests/JIT/HardwareIntrinsics/X86/Shared/ExtractScalarTest.template +++ b/src/tests/JIT/HardwareIntrinsics/X86/Shared/ExtractScalarTest.template @@ -41,9 +41,6 @@ namespace JIT.HardwareIntrinsics.X86 // Validates calling via reflection works, using Unsafe.Read test.RunReflectionScenario_UnsafeRead(); - // Validates passing a static member works - test.RunClsVarScenario(); - // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); @@ -104,18 +101,10 @@ namespace JIT.HardwareIntrinsics.X86 private static {Op1BaseType}[] _data = new {Op1BaseType}[Op1ElementCount]; - private static {Op1VectorType}<{Op1BaseType}> _clsVar; - private {Op1VectorType}<{Op1BaseType}> _fld; private SimpleUnaryOpTest__DataTable<{RetBaseType}, {Op1BaseType}> _dataTable; - static ExtractScalarTest__{Method}{RetBaseType}{Imm}() - { - for (var i = 0; i < Op1ElementCount; i++) { _data[i] = {NextValueOp1}; } - Unsafe.CopyBlockUnaligned(ref Unsafe.As<{Op1VectorType}<{Op1BaseType}>, byte>(ref _clsVar), ref Unsafe.As<{Op1BaseType}, byte>(ref _data[0]), (uint)Unsafe.SizeOf<{Op1VectorType}<{Op1BaseType}>>()); - } - public ExtractScalarTest__{Method}{RetBaseType}{Imm}() { Succeeded = true; @@ -184,19 +173,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(_dataTable.inArrayPtr, _dataTable.outArrayPtr); } - public void RunClsVarScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario)); - - var result = {Isa}.{Method}( - _clsVar, - {Imm} - ); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(_clsVar, _dataTable.outArrayPtr); - } - public void RunLclVarScenario_UnsafeRead() { TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_UnsafeRead)); diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Shared/ExtractVector128Test.template b/src/tests/JIT/HardwareIntrinsics/X86/Shared/ExtractVector128Test.template index 142c8c9d5f5d24..74cbec105589db 100644 --- a/src/tests/JIT/HardwareIntrinsics/X86/Shared/ExtractVector128Test.template +++ b/src/tests/JIT/HardwareIntrinsics/X86/Shared/ExtractVector128Test.template @@ -41,9 +41,6 @@ namespace JIT.HardwareIntrinsics.X86 // Validates calling via reflection works, using Unsafe.Read test.RunReflectionScenario_UnsafeRead(); - // Validates passing a static member works - test.RunClsVarScenario(); - // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); @@ -104,18 +101,10 @@ namespace JIT.HardwareIntrinsics.X86 private static {Op1BaseType}[] _data = new {Op1BaseType}[Op1ElementCount]; - private static {Op1VectorType}<{Op1BaseType}> _clsVar; - private {Op1VectorType}<{Op1BaseType}> _fld; private SimpleUnaryOpTest__DataTable<{RetBaseType}, {Op1BaseType}> _dataTable; - static ExtractVector128Test__{Method}{RetBaseType}{Imm}() - { - for (var i = 0; i < Op1ElementCount; i++) { _data[i] = {NextValueOp1}; } - Unsafe.CopyBlockUnaligned(ref Unsafe.As<{Op1VectorType}<{Op1BaseType}>, byte>(ref _clsVar), ref Unsafe.As<{Op1BaseType}, byte>(ref _data[0]), (uint)Unsafe.SizeOf<{Op1VectorType}<{Op1BaseType}>>()); - } - public ExtractVector128Test__{Method}{RetBaseType}{Imm}() { Succeeded = true; @@ -184,19 +173,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(_dataTable.inArrayPtr, _dataTable.outArrayPtr); } - public void RunClsVarScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario)); - - var result = {Isa}.{Method}( - _clsVar, - {Imm} - ); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(_clsVar, _dataTable.outArrayPtr); - } - public void RunLclVarScenario_UnsafeRead() { TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_UnsafeRead)); diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Shared/GenericUnOpTest.template b/src/tests/JIT/HardwareIntrinsics/X86/Shared/GenericUnOpTest.template index 0eae20ea27a053..96bf96df1966e4 100644 --- a/src/tests/JIT/HardwareIntrinsics/X86/Shared/GenericUnOpTest.template +++ b/src/tests/JIT/HardwareIntrinsics/X86/Shared/GenericUnOpTest.template @@ -41,9 +41,6 @@ namespace JIT.HardwareIntrinsics.X86 // Validates calling via reflection works, using Unsafe.Read test.RunReflectionScenario_UnsafeRead(); - // Validates passing a static member works - test.RunClsVarScenario(); - // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); @@ -104,18 +101,10 @@ namespace JIT.HardwareIntrinsics.X86 private static {Op1BaseType}[] _data = new {Op1BaseType}[Op1ElementCount]; - private static {Op1VectorType}<{Op1BaseType}> _clsVar; - private {Op1VectorType}<{Op1BaseType}> _fld; private SimpleUnaryOpTest__DataTable<{RetBaseType}, {Op1BaseType}> _dataTable; - static GenericUnaryOpTest__{Method}{RetBaseType}() - { - for (var i = 0; i < Op1ElementCount; i++) { _data[i] = {NextValueOp1}; } - Unsafe.CopyBlockUnaligned(ref Unsafe.As<{Op1VectorType}<{Op1BaseType}>, byte>(ref _clsVar), ref Unsafe.As<{Op1BaseType}, byte>(ref _data[0]), (uint)Unsafe.SizeOf<{Op1VectorType}<{Op1BaseType}>>()); - } - public GenericUnaryOpTest__{Method}{RetBaseType}() { Succeeded = true; @@ -181,18 +170,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(_dataTable.inArrayPtr, _dataTable.outArrayPtr); } - public void RunClsVarScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario)); - - var result = {Isa}.{Method}<{RetBaseType}>( - _clsVar - ); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(_clsVar, _dataTable.outArrayPtr); - } - public void RunLclVarScenario_UnsafeRead() { TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_UnsafeRead)); diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Shared/ImmBinOpTest.template b/src/tests/JIT/HardwareIntrinsics/X86/Shared/ImmBinOpTest.template index 998dde17a6af01..eeb659eee6185d 100644 --- a/src/tests/JIT/HardwareIntrinsics/X86/Shared/ImmBinOpTest.template +++ b/src/tests/JIT/HardwareIntrinsics/X86/Shared/ImmBinOpTest.template @@ -41,9 +41,6 @@ namespace JIT.HardwareIntrinsics.X86 // Validates calling via reflection works, using Unsafe.Read test.RunReflectionScenario_UnsafeRead(); - // Validates passing a static member works - test.RunClsVarScenario(); - // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); @@ -109,22 +106,11 @@ namespace JIT.HardwareIntrinsics.X86 private static {Op1BaseType}[] _data1 = new {Op1BaseType}[Op1ElementCount]; private static {Op2BaseType}[] _data2 = new {Op2BaseType}[Op2ElementCount]; - private static {Op1VectorType}<{Op1BaseType}> _clsVar1; - private static {Op2VectorType}<{Op2BaseType}> _clsVar2; - private {Op1VectorType}<{Op1BaseType}> _fld1; private {Op2VectorType}<{Op2BaseType}> _fld2; private SimpleBinaryOpTest__DataTable<{RetBaseType}, {Op1BaseType}, {Op2BaseType}> _dataTable; - static ImmBinaryOpTest__{Method}{RetBaseType}{Imm}() - { - for (var i = 0; i < Op1ElementCount; i++) { _data1[i] = {NextValueOp1}; } - Unsafe.CopyBlockUnaligned(ref Unsafe.As<{Op1VectorType}<{Op1BaseType}>, byte>(ref _clsVar1), ref Unsafe.As<{Op1BaseType}, byte>(ref _data1[0]), (uint)Unsafe.SizeOf<{Op1VectorType}<{Op1BaseType}>>()); - for (var i = 0; i < Op2ElementCount; i++) { _data2[i] = {NextValueOp2}; } - Unsafe.CopyBlockUnaligned(ref Unsafe.As<{Op2VectorType}<{Op2BaseType}>, byte>(ref _clsVar2), ref Unsafe.As<{Op2BaseType}, byte>(ref _data2[0]), (uint)Unsafe.SizeOf<{Op2VectorType}<{Op2BaseType}>>()); - } - public ImmBinaryOpTest__{Method}{RetBaseType}{Imm}() { Succeeded = true; @@ -200,20 +186,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(_dataTable.inArray1Ptr, _dataTable.inArray2Ptr, _dataTable.outArrayPtr); } - public void RunClsVarScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario)); - - var result = {Isa}.{Method}( - _clsVar1, - _clsVar2, - {Imm} - ); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(_clsVar1, _clsVar2, _dataTable.outArrayPtr); - } - public void RunLclVarScenario_UnsafeRead() { TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_UnsafeRead)); diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Shared/ImmUnOpTest.template b/src/tests/JIT/HardwareIntrinsics/X86/Shared/ImmUnOpTest.template index 7a1928b58f439d..e05ff8e05e5c8f 100644 --- a/src/tests/JIT/HardwareIntrinsics/X86/Shared/ImmUnOpTest.template +++ b/src/tests/JIT/HardwareIntrinsics/X86/Shared/ImmUnOpTest.template @@ -41,9 +41,6 @@ namespace JIT.HardwareIntrinsics.X86 // Validates calling via reflection works, using Unsafe.Read test.RunReflectionScenario_UnsafeRead(); - // Validates passing a static member works - test.RunClsVarScenario(); - // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); @@ -104,18 +101,10 @@ namespace JIT.HardwareIntrinsics.X86 private static {Op1BaseType}[] _data = new {Op1BaseType}[Op1ElementCount]; - private static {Op1VectorType}<{Op1BaseType}> _clsVar; - private {Op1VectorType}<{Op1BaseType}> _fld; private SimpleUnaryOpTest__DataTable<{RetBaseType}, {Op1BaseType}> _dataTable; - static ImmUnaryOpTest__{Method}{RetBaseType}{Imm}() - { - for (var i = 0; i < Op1ElementCount; i++) { _data[i] = {NextValueOp1}; } - Unsafe.CopyBlockUnaligned(ref Unsafe.As<{Op1VectorType}<{Op1BaseType}>, byte>(ref _clsVar), ref Unsafe.As<{Op1BaseType}, byte>(ref _data[0]), (uint)Unsafe.SizeOf<{Op1VectorType}<{Op1BaseType}>>()); - } - public ImmUnaryOpTest__{Method}{RetBaseType}{Imm}() { Succeeded = true; @@ -184,19 +173,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(_dataTable.inArrayPtr, _dataTable.outArrayPtr); } - public void RunClsVarScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario)); - - var result = {Isa}.{Method}( - _clsVar, - {Imm} - ); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(_clsVar, _dataTable.outArrayPtr); - } - public void RunLclVarScenario_UnsafeRead() { TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_UnsafeRead)); diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Shared/InsertScalarTest.template b/src/tests/JIT/HardwareIntrinsics/X86/Shared/InsertScalarTest.template index 5b272951df5546..c11c233b863fee 100644 --- a/src/tests/JIT/HardwareIntrinsics/X86/Shared/InsertScalarTest.template +++ b/src/tests/JIT/HardwareIntrinsics/X86/Shared/InsertScalarTest.template @@ -41,9 +41,6 @@ namespace JIT.HardwareIntrinsics.X86 // Validates calling via reflection works, using Unsafe.Read test.RunReflectionScenario(); - // Validates passing a static member works - test.RunClsVarScenario(); - // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario(); @@ -108,19 +105,11 @@ namespace JIT.HardwareIntrinsics.X86 private static {Op1BaseType}[] _data = new {Op1BaseType}[Op1ElementCount]; private static {Op1BaseType} _scalarClsData = {Data}; - private static {Op1VectorType}<{Op1BaseType}> _clsVar; - private {Op1VectorType}<{Op1BaseType}> _fld; private {Op1BaseType} _scalarFldData = {Data}; private SimpleUnaryOpTest__DataTable<{RetBaseType}, {Op1BaseType}> _dataTable; - static InsertScalarTest__{Method}{RetBaseType}{Imm}() - { - for (var i = 0; i < Op1ElementCount; i++) { _data[i] = {NextValueOp1}; } - Unsafe.CopyBlockUnaligned(ref Unsafe.As<{Op1VectorType}<{Op1BaseType}>, byte>(ref _clsVar), ref Unsafe.As<{Op1BaseType}, byte>(ref _data[0]), (uint)Unsafe.SizeOf<{Op1VectorType}<{Op1BaseType}>>()); - } - public InsertScalarTest__{Method}{RetBaseType}{Imm}() { Succeeded = true; @@ -199,20 +188,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(_dataTable.inArrayPtr, {Data}, _dataTable.outArrayPtr); } - public void RunClsVarScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario)); - - var result = {Isa}.{Method}( - _clsVar, - _scalarClsData, - {Imm} - ); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(_clsVar, _scalarClsData,_dataTable.outArrayPtr); - } - public void RunLclVarScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario)); diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Shared/InsertVector128Test.template b/src/tests/JIT/HardwareIntrinsics/X86/Shared/InsertVector128Test.template index fb3466861da4a7..d49542698d778d 100644 --- a/src/tests/JIT/HardwareIntrinsics/X86/Shared/InsertVector128Test.template +++ b/src/tests/JIT/HardwareIntrinsics/X86/Shared/InsertVector128Test.template @@ -43,9 +43,6 @@ namespace JIT.HardwareIntrinsics.X86 // Validates calling via reflection works, using Unsafe.Read test.RunReflectionScenario_UnsafeRead(); - // Validates passing a static member works - test.RunClsVarScenario(); - // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); @@ -111,22 +108,11 @@ namespace JIT.HardwareIntrinsics.X86 private static {Op1BaseType}[] _data1 = new {Op1BaseType}[Op1ElementCount]; private static {Op2BaseType}[] _data2 = new {Op2BaseType}[Op2ElementCount]; - private static {Op1VectorType}<{Op1BaseType}> _clsVar1; - private static {Op2VectorType}<{Op2BaseType}> _clsVar2; - private {Op1VectorType}<{Op1BaseType}> _fld1; private {Op2VectorType}<{Op2BaseType}> _fld2; private SimpleBinaryOpTest__DataTable<{RetBaseType}, {Op1BaseType}, {Op2BaseType}> _dataTable; - static InsertVector128Test__{Method}{RetBaseType}{Imm}() - { - for (var i = 0; i < Op1ElementCount; i++) { _data1[i] = {NextValueOp1}; } - Unsafe.CopyBlockUnaligned(ref Unsafe.As<{Op1VectorType}<{Op1BaseType}>, byte>(ref _clsVar1), ref Unsafe.As<{Op1BaseType}, byte>(ref _data1[0]), (uint)Unsafe.SizeOf<{Op1VectorType}<{Op1BaseType}>>()); - for (var i = 0; i < Op2ElementCount; i++) { _data2[i] = {NextValueOp2}; } - Unsafe.CopyBlockUnaligned(ref Unsafe.As<{Op2VectorType}<{Op2BaseType}>, byte>(ref _clsVar2), ref Unsafe.As<{Op2BaseType}, byte>(ref _data2[0]), (uint)Unsafe.SizeOf<{Op2VectorType}<{Op2BaseType}>>()); - } - public InsertVector128Test__{Method}{RetBaseType}{Imm}() { Succeeded = true; @@ -202,20 +188,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(_dataTable.inArray1Ptr, _dataTable.inArray2Ptr, _dataTable.outArrayPtr); } - public void RunClsVarScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario)); - - var result = {Isa}.{Method}( - _clsVar1, - _clsVar2, - {Imm} - ); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(_clsVar1, _clsVar2, _dataTable.outArrayPtr); - } - public void RunLclVarScenario_UnsafeRead() { TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_UnsafeRead)); diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Shared/LoadBinOpTest.template b/src/tests/JIT/HardwareIntrinsics/X86/Shared/LoadBinOpTest.template index 247f268f4294c9..e4de0393118ca8 100644 --- a/src/tests/JIT/HardwareIntrinsics/X86/Shared/LoadBinOpTest.template +++ b/src/tests/JIT/HardwareIntrinsics/X86/Shared/LoadBinOpTest.template @@ -42,9 +42,6 @@ namespace JIT.HardwareIntrinsics.X86 // Validates calling via reflection works, using Unsafe.Read test.RunReflectionScenario_UnsafeRead(); - // Validates passing a static member works - test.RunClsVarScenario(); - // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); @@ -109,20 +106,10 @@ namespace JIT.HardwareIntrinsics.X86 private static {Op1BaseType}[] _data1 = new {Op1BaseType}[Op1ElementCount]; private static {Op2BaseType}[] _data2 = new {Op2BaseType}[Op2ElementCount]; - private static {Op2VectorType}<{Op2BaseType}> _clsVar2; - private {Op2VectorType}<{Op2BaseType}> _fld2; private SimpleBinaryOpTest__DataTable<{RetBaseType}, {Op1BaseType}, {Op2BaseType}> _dataTable; - static SimpleBinaryOpTest__{Method}{RetBaseType}() - { - for (var i = 0; i < Op1ElementCount; i++) { _data1[i] = {NextValueOp1}; } - - for (var i = 0; i < Op2ElementCount; i++) { _data2[i] = {NextValueOp2}; } - Unsafe.CopyBlockUnaligned(ref Unsafe.As<{Op2VectorType}<{Op2BaseType}>, byte>(ref _clsVar2), ref Unsafe.As<{Op2BaseType}, byte>(ref _data2[0]), (uint)Unsafe.SizeOf<{Op2VectorType}<{Op2BaseType}>>()); - } - public SimpleBinaryOpTest__{Method}{RetBaseType}() { Succeeded = true; @@ -193,19 +180,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(_dataTable.inArray1Ptr, _dataTable.inArray2Ptr, _dataTable.outArrayPtr); } - public void RunClsVarScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario)); - - var result = {Isa}.{Method}( - ({RetBaseType}*)_dataTable.inArray1Ptr, - _clsVar2 - ); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(_dataTable.inArray1Ptr, _clsVar2, _dataTable.outArrayPtr); - } - public void RunLclVarScenario_UnsafeRead() { TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_UnsafeRead)); diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Shared/PclmulqdqOpTest.template b/src/tests/JIT/HardwareIntrinsics/X86/Shared/PclmulqdqOpTest.template index 871e9bc011e228..b69e50dc99e7bd 100644 --- a/src/tests/JIT/HardwareIntrinsics/X86/Shared/PclmulqdqOpTest.template +++ b/src/tests/JIT/HardwareIntrinsics/X86/Shared/PclmulqdqOpTest.template @@ -41,9 +41,6 @@ namespace JIT.HardwareIntrinsics.X86 // Validates calling via reflection works, using Unsafe.Read test.RunReflectionScenario_UnsafeRead(); - // Validates passing a static member works - test.RunClsVarScenario(); - // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); @@ -106,21 +103,11 @@ namespace JIT.HardwareIntrinsics.X86 private static {Op2BaseType}[] _data2 = new {Op2BaseType}[{Input2Size}] {Input2}; private static {RetBaseType}[] _expectedRet = new {RetBaseType}[{ExpectedRetSize}] {ExpectedRet}; - private static {Op1VectorType}<{Op1BaseType}> _clsVar1; - private static {Op2VectorType}<{Op2BaseType}> _clsVar2; - private {Op1VectorType}<{Op1BaseType}> _fld1; private {Op2VectorType}<{Op2BaseType}> _fld2; private SimpleBinaryOpTest__DataTable<{RetBaseType}, {Op1BaseType}, {Op2BaseType}> _dataTable; - static PclmulqdqOpTest__{Method}{RetBaseType}{Imm}() - { - - Unsafe.CopyBlockUnaligned(ref Unsafe.As<{Op1VectorType}<{Op1BaseType}>, byte>(ref _clsVar1), ref Unsafe.As<{Op1BaseType}, byte>(ref _data1[0]), (uint)Unsafe.SizeOf<{Op1VectorType}<{Op1BaseType}>>()); - Unsafe.CopyBlockUnaligned(ref Unsafe.As<{Op2VectorType}<{Op2BaseType}>, byte>(ref _clsVar2), ref Unsafe.As<{Op2BaseType}, byte>(ref _data2[0]), (uint)Unsafe.SizeOf<{Op2VectorType}<{Op2BaseType}>>()); - } - public PclmulqdqOpTest__{Method}{RetBaseType}{Imm}() { Succeeded = true; @@ -193,20 +180,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(_dataTable.outArrayPtr); } - public void RunClsVarScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario)); - - var result = {Isa}.{Method}( - _clsVar1, - _clsVar2, - {Imm} - ); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(_dataTable.outArrayPtr); - } - public void RunLclVarScenario_UnsafeRead() { TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_UnsafeRead)); @@ -299,7 +272,7 @@ namespace JIT.HardwareIntrinsics.X86 if (result[i] != _expectedRet[i] ) { succeeded = false; - } + } } if (!succeeded) diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Shared/ScalarBinOpTest.template b/src/tests/JIT/HardwareIntrinsics/X86/Shared/ScalarBinOpTest.template index 5bc1ae2629e075..b24b8e119481c2 100644 --- a/src/tests/JIT/HardwareIntrinsics/X86/Shared/ScalarBinOpTest.template +++ b/src/tests/JIT/HardwareIntrinsics/X86/Shared/ScalarBinOpTest.template @@ -32,9 +32,6 @@ namespace JIT.HardwareIntrinsics.X86 // Validates calling via reflection works, using Unsafe.ReadUnaligned test.RunReflectionScenario_UnsafeRead(); - // Validates passing a static member works - test.RunClsVarScenario(); - // Validates passing a local works, using Unsafe.ReadUnaligned test.RunLclVarScenario_UnsafeRead(); @@ -90,18 +87,9 @@ namespace JIT.HardwareIntrinsics.X86 private static {Op1BaseType} _data1; private static {Op2BaseType} _data2; - private static {Op1BaseType} _clsVar1; - private static {Op2BaseType} _clsVar2; - private {Op1BaseType} _fld1; private {Op2BaseType} _fld2; - static ScalarBinaryOpTest__{Method}{RetBaseType}() - { - _clsVar1 = {NextValueOp1}; - _clsVar2 = {NextValueOp2}; - } - public ScalarBinaryOpTest__{Method}{RetBaseType}() { Succeeded = true; @@ -142,18 +130,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(_data1, _data2, ({RetBaseType})result); } - public void RunClsVarScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario)); - - var result = {Isa}.{Method}( - _clsVar1, - _clsVar2 - ); - - ValidateResult(_clsVar1, _clsVar2, result); - } - public void RunLclVarScenario_UnsafeRead() { TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_UnsafeRead)); diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Shared/ScalarSimdUnOpTest.template b/src/tests/JIT/HardwareIntrinsics/X86/Shared/ScalarSimdUnOpTest.template index 87487817ca1806..49f0885b196d0c 100644 --- a/src/tests/JIT/HardwareIntrinsics/X86/Shared/ScalarSimdUnOpTest.template +++ b/src/tests/JIT/HardwareIntrinsics/X86/Shared/ScalarSimdUnOpTest.template @@ -32,9 +32,6 @@ namespace JIT.HardwareIntrinsics.X86 // Validates calling via reflection works test.RunReflectionScenario_UnsafeRead(); - // Validates passing a static member works - test.RunClsVarScenario(); - // Validates passing a local works test.RunLclVarScenario_UnsafeRead(); @@ -92,17 +89,10 @@ namespace JIT.HardwareIntrinsics.X86 private static {Op1BaseType} _data; - private static {Op1BaseType} _clsVar; - private {Op1BaseType} _fld; private ScalarSimdUnaryOpTest__DataTable<{RetBaseType}> _dataTable; - static ScalarSimdUnaryOpTest__{Method}{RetBaseType}() - { - _clsVar = {NextValueOp1}; - } - public ScalarSimdUnaryOpTest__{Method}{RetBaseType}() { Succeeded = true; @@ -141,18 +131,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(_data, _dataTable.outArrayPtr); } - public void RunClsVarScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario)); - - var result = {Isa}.{Method}( - _clsVar - ); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(_clsVar, _dataTable.outArrayPtr); - } - public void RunLclVarScenario_UnsafeRead() { TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_UnsafeRead)); diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Shared/ScalarTernOpBinResTest.template b/src/tests/JIT/HardwareIntrinsics/X86/Shared/ScalarTernOpBinResTest.template index adaf228d3da61e..daada6a98ddac2 100644 --- a/src/tests/JIT/HardwareIntrinsics/X86/Shared/ScalarTernOpBinResTest.template +++ b/src/tests/JIT/HardwareIntrinsics/X86/Shared/ScalarTernOpBinResTest.template @@ -33,9 +33,6 @@ namespace JIT.HardwareIntrinsics.X86 // Validates calling via reflection works, using Unsafe.ReadUnaligned test.RunReflectionScenario_UnsafeRead(); - // Validates passing a static member works - test.RunClsVarScenario(); - // Validates passing a local works, using Unsafe.ReadUnaligned test.RunLclVarScenario_UnsafeRead(); @@ -95,21 +92,10 @@ namespace JIT.HardwareIntrinsics.X86 private static {Op2BaseType} _data2; private static {Op3BaseType} _data3; - private static {Op1BaseType} _clsVar1; - private static {Op2BaseType} _clsVar2; - private static {Op3BaseType} _clsVar3; - private {Op1BaseType} _fld1; private {Op2BaseType} _fld2; private {Op3BaseType} _fld3; - static ScalarTernOpBinResTest__{Method}{RetBaseType}() - { - _clsVar1 = {NextValueOp1}; - _clsVar2 = {NextValueOp2}; - _clsVar3 = {NextValueOp3}; - } - public ScalarTernOpBinResTest__{Method}{RetBaseType}() { Succeeded = true; @@ -158,19 +144,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(_data1, _data2, buffer, ({RetBaseType})result); } - public void RunClsVarScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario)); - {Op3BaseType} buffer = 0; - var result = {Isa}.{Method}( - _clsVar1, - _clsVar2, - &buffer - ); - - ValidateResult(_clsVar1, _clsVar2, buffer, result); - } - public void RunLclVarScenario_UnsafeRead() { TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_UnsafeRead)); diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Shared/ScalarTernOpTest.template b/src/tests/JIT/HardwareIntrinsics/X86/Shared/ScalarTernOpTest.template index 7b5311fb6e45c8..0849eed77ec557 100644 --- a/src/tests/JIT/HardwareIntrinsics/X86/Shared/ScalarTernOpTest.template +++ b/src/tests/JIT/HardwareIntrinsics/X86/Shared/ScalarTernOpTest.template @@ -32,9 +32,6 @@ namespace JIT.HardwareIntrinsics.X86 // Validates calling via reflection works, using Unsafe.ReadUnaligned test.RunReflectionScenario_UnsafeRead(); - // Validates passing a static member works - test.RunClsVarScenario(); - // Validates passing a local works, using Unsafe.ReadUnaligned test.RunLclVarScenario_UnsafeRead(); @@ -93,21 +90,10 @@ namespace JIT.HardwareIntrinsics.X86 private static {Op2BaseType} _data2; private static {Op3BaseType} _data3; - private static {Op1BaseType} _clsVar1; - private static {Op2BaseType} _clsVar2; - private static {Op3BaseType} _clsVar3; - private {Op1BaseType} _fld1; private {Op2BaseType} _fld2; private {Op3BaseType} _fld3; - static ScalarTernOpTest__{Method}{RetBaseType}() - { - _clsVar1 = {NextValueOp1}; - _clsVar2 = {NextValueOp2}; - _clsVar3 = {NextValueOp3}; - } - public ScalarTernOpTest__{Method}{RetBaseType}() { Succeeded = true; @@ -152,19 +138,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(_data1, _data2, _data3, ({RetBaseType})result); } - public void RunClsVarScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario)); - - var result = {Isa}.{Method}( - _clsVar1, - _clsVar2, - _clsVar3 - ); - - ValidateResult(_clsVar1, _clsVar2, _clsVar3, result); - } - public void RunLclVarScenario_UnsafeRead() { TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_UnsafeRead)); diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Shared/ScalarTernOpTupleBinRetTest.template b/src/tests/JIT/HardwareIntrinsics/X86/Shared/ScalarTernOpTupleBinRetTest.template index 601913aa060180..9385ed17e66781 100644 --- a/src/tests/JIT/HardwareIntrinsics/X86/Shared/ScalarTernOpTupleBinRetTest.template +++ b/src/tests/JIT/HardwareIntrinsics/X86/Shared/ScalarTernOpTupleBinRetTest.template @@ -29,9 +29,6 @@ namespace JIT.HardwareIntrinsics.X86 // Validates calling via reflection works, using Unsafe.ReadUnaligned test.RunReflectionScenario_UnsafeRead(); - // Validates passing a static member works - test.RunClsVarScenario(); - // Validates passing a local works, using Unsafe.ReadUnaligned test.RunLclVarScenario_UnsafeRead(); @@ -90,21 +87,10 @@ namespace JIT.HardwareIntrinsics.X86 private static {Op2BaseType} _data2; private static {Op3BaseType} _data3; - private static {Op1BaseType} _clsVar1; - private static {Op2BaseType} _clsVar2; - private static {Op3BaseType} _clsVar3; - private {Op1BaseType} _fld1; private {Op2BaseType} _fld2; private {Op3BaseType} _fld3; - static ScalarTernOpTupleTest__{Method}{RetBaseType}() - { - _clsVar1 = {NextValueOp1}; - _clsVar2 = {NextValueOp2}; - _clsVar3 = {NextValueOp3}; - } - public ScalarTernOpTupleTest__{Method}{RetBaseType}() { Succeeded = true; @@ -149,19 +135,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(_data1, _data2, _data3, (({RetBaseType}, {RetBaseType}))result); } - public void RunClsVarScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario)); - - var result = {Isa}.{Method}( - _clsVar1, - _clsVar2, - _clsVar3 - ); - - ValidateResult(_clsVar1, _clsVar2, _clsVar3, result); - } - public void RunLclVarScenario_UnsafeRead() { TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_UnsafeRead)); diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Shared/ScalarUnOpTest.template b/src/tests/JIT/HardwareIntrinsics/X86/Shared/ScalarUnOpTest.template index 06ee75d61af9e6..7d11fd06d9599e 100644 --- a/src/tests/JIT/HardwareIntrinsics/X86/Shared/ScalarUnOpTest.template +++ b/src/tests/JIT/HardwareIntrinsics/X86/Shared/ScalarUnOpTest.template @@ -32,9 +32,6 @@ namespace JIT.HardwareIntrinsics.X86 // Validates calling via reflection works, using Unsafe.ReadUnaligned test.RunReflectionScenario_UnsafeRead(); - // Validates passing a static member works - test.RunClsVarScenario(); - // Validates passing a local works, using Unsafe.ReadUnaligned test.RunLclVarScenario_UnsafeRead(); @@ -86,20 +83,13 @@ namespace JIT.HardwareIntrinsics.X86 private static {Op1BaseType} _data; - private static {Op1BaseType} _clsVar; - private {Op1BaseType} _fld; - static ScalarUnaryOpTest__{Method}{RetBaseType}() - { - _clsVar = {NextValueOp1}; - } - public ScalarUnaryOpTest__{Method}{RetBaseType}() { Succeeded = true; - + _fld = {NextValueOp1}; _data = {NextValueOp1}; } @@ -131,17 +121,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(_data, ({RetBaseType})result); } - public void RunClsVarScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario)); - - var result = {Isa}.{Method}( - _clsVar - ); - - ValidateResult(_clsVar, result); - } - public void RunLclVarScenario_UnsafeRead() { TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_UnsafeRead)); diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Shared/SimdScalarUnOpConvTest.template b/src/tests/JIT/HardwareIntrinsics/X86/Shared/SimdScalarUnOpConvTest.template index 4f4fae5e64d631..b7aa69ed91fcce 100644 --- a/src/tests/JIT/HardwareIntrinsics/X86/Shared/SimdScalarUnOpConvTest.template +++ b/src/tests/JIT/HardwareIntrinsics/X86/Shared/SimdScalarUnOpConvTest.template @@ -42,9 +42,6 @@ namespace JIT.HardwareIntrinsics.X86 // Validates calling via reflection works, using Unsafe.Read test.RunReflectionScenario_UnsafeRead(); - // Validates passing a static member works - test.RunClsVarScenario(); - // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); @@ -102,18 +99,10 @@ namespace JIT.HardwareIntrinsics.X86 private static {Op1BaseType}[] _data = new {Op1BaseType}[Op1ElementCount]; - private static {Op1VectorType}<{Op1BaseType}> _clsVar; - private {Op1VectorType}<{Op1BaseType}> _fld; private SimdScalarUnaryOpTest__DataTable<{Op1BaseType}> _dataTable; - static SimdScalarUnaryOpConvertTest__{Method}{Op1VectorType}{Op1BaseType}() - { - for (var i = 0; i < Op1ElementCount; i++) { _data[i] = {NextValueOp1}; } - Unsafe.CopyBlockUnaligned(ref Unsafe.As<{Op1VectorType}<{Op1BaseType}>, byte>(ref _clsVar), ref Unsafe.As<{Op1BaseType}, byte>(ref _data[0]), (uint)Unsafe.SizeOf<{Op1VectorType}<{Op1BaseType}>>()); - } - public SimdScalarUnaryOpConvertTest__{Method}{Op1VectorType}{Op1BaseType}() { Succeeded = true; @@ -174,17 +163,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(_dataTable.inArrayPtr, ({RetBaseType})(result)); } - public void RunClsVarScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario)); - - var result = {Isa}.{Method}( - _clsVar - ); - - ValidateResult(_clsVar, result); - } - public void RunLclVarScenario_UnsafeRead() { TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_UnsafeRead)); diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Shared/SimdScalarUnOpTest.template b/src/tests/JIT/HardwareIntrinsics/X86/Shared/SimdScalarUnOpTest.template index 042a30ccc4d70c..450dcb0ea452be 100644 --- a/src/tests/JIT/HardwareIntrinsics/X86/Shared/SimdScalarUnOpTest.template +++ b/src/tests/JIT/HardwareIntrinsics/X86/Shared/SimdScalarUnOpTest.template @@ -42,9 +42,6 @@ namespace JIT.HardwareIntrinsics.X86 // Validates calling via reflection works, using Unsafe.Read test.RunReflectionScenario_UnsafeRead(); - // Validates passing a static member works - test.RunClsVarScenario(); - // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); @@ -102,18 +99,10 @@ namespace JIT.HardwareIntrinsics.X86 private static {Op1BaseType}[] _data = new {Op1BaseType}[Op1ElementCount]; - private static {Op1VectorType}<{Op1BaseType}> _clsVar; - private {Op1VectorType}<{Op1BaseType}> _fld; private SimdScalarUnaryOpTest__DataTable<{Op1BaseType}> _dataTable; - static SimdScalarUnaryOpTest__{Method}{RetBaseType}() - { - for (var i = 0; i < Op1ElementCount; i++) { _data[i] = {NextValueOp1}; } - Unsafe.CopyBlockUnaligned(ref Unsafe.As<{Op1VectorType}<{Op1BaseType}>, byte>(ref _clsVar), ref Unsafe.As<{Op1BaseType}, byte>(ref _data[0]), (uint)Unsafe.SizeOf<{Op1VectorType}<{Op1BaseType}>>()); - } - public SimdScalarUnaryOpTest__{Method}{RetBaseType}() { Succeeded = true; @@ -174,17 +163,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(_dataTable.inArrayPtr, ({RetBaseType})(result)); } - public void RunClsVarScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario)); - - var result = {Isa}.{Method}( - _clsVar - ); - - ValidateResult(_clsVar, result); - } - public void RunLclVarScenario_UnsafeRead() { TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_UnsafeRead)); diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Shared/SimpleBinOpConvTest.template b/src/tests/JIT/HardwareIntrinsics/X86/Shared/SimpleBinOpConvTest.template index 765269c3b49a19..1df5802cf3614f 100644 --- a/src/tests/JIT/HardwareIntrinsics/X86/Shared/SimpleBinOpConvTest.template +++ b/src/tests/JIT/HardwareIntrinsics/X86/Shared/SimpleBinOpConvTest.template @@ -42,9 +42,6 @@ namespace JIT.HardwareIntrinsics.X86 // Validates calling via reflection works, using Unsafe.Read test.RunReflectionScenario_UnsafeRead(); - // Validates passing a static member works - test.RunClsVarScenario(); - // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); @@ -108,22 +105,11 @@ namespace JIT.HardwareIntrinsics.X86 private static {Op1BaseType}[] _data1 = new {Op1BaseType}[Op1ElementCount]; private static {Op2BaseType} _data2; - private static {Op1VectorType}<{Op1BaseType}> _clsVar1; - private static {Op2BaseType} _clsVar2; - private {Op1VectorType}<{Op1BaseType}> _fld1; private {Op2BaseType} _fld2; private SimpleBinaryOpConvTest__DataTable<{RetBaseType}, {Op1BaseType}, {Op2BaseType}> _dataTable; - static SimpleBinaryOpConvTest__{Method}{RetBaseType}() - { - for (var i = 0; i < Op1ElementCount; i++) { _data1[i] = {NextValueOp1}; } - Unsafe.CopyBlockUnaligned(ref Unsafe.As<{Op1VectorType}<{Op1BaseType}>, byte>(ref _clsVar1), ref Unsafe.As<{Op1BaseType}, byte>(ref _data1[0]), (uint)Unsafe.SizeOf<{Op1VectorType}<{Op1BaseType}>>()); - _data2 = {NextValueOp2}; - _clsVar2 = _data2; - } - public SimpleBinaryOpConvTest__{Method}{RetBaseType}() { Succeeded = true; @@ -193,19 +179,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(_dataTable.inArray1Ptr, _dataTable.inData2, _dataTable.outArrayPtr); } - public void RunClsVarScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario)); - - var result = {Isa}.{Method}( - _clsVar1, - _clsVar2 - ); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(_clsVar1, _clsVar2, _dataTable.outArrayPtr); - } - public void RunLclVarScenario_UnsafeRead() { TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_UnsafeRead)); diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Shared/SimpleUnOpConvTest.template b/src/tests/JIT/HardwareIntrinsics/X86/Shared/SimpleUnOpConvTest.template index 355d754869cb01..055c757c25b480 100644 --- a/src/tests/JIT/HardwareIntrinsics/X86/Shared/SimpleUnOpConvTest.template +++ b/src/tests/JIT/HardwareIntrinsics/X86/Shared/SimpleUnOpConvTest.template @@ -41,9 +41,6 @@ namespace JIT.HardwareIntrinsics.X86 // Validates calling via reflection works, using Unsafe.Read test.RunReflectionScenario_UnsafeRead(); - // Validates passing a static member works - test.RunClsVarScenario(); - // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); @@ -104,18 +101,10 @@ namespace JIT.HardwareIntrinsics.X86 private static {Op1BaseType}[] _data = new {Op1BaseType}[Op1ElementCount]; - private static {Op1VectorType}<{Op1BaseType}> _clsVar; - private {Op1VectorType}<{Op1BaseType}> _fld; private SimpleUnaryOpTest__DataTable<{RetBaseType}, {Op1BaseType}> _dataTable; - static SimpleUnaryOpConvTest__{Method}{Op1VectorType}{Op1BaseType}() - { - for (var i = 0; i < Op1ElementCount; i++) { _data[i] = {NextValueOp1}; } - Unsafe.CopyBlockUnaligned(ref Unsafe.As<{Op1VectorType}<{Op1BaseType}>, byte>(ref _clsVar), ref Unsafe.As<{Op1BaseType}, byte>(ref _data[0]), (uint)Unsafe.SizeOf<{Op1VectorType}<{Op1BaseType}>>()); - } - public SimpleUnaryOpConvTest__{Method}{Op1VectorType}{Op1BaseType}() { Succeeded = true; @@ -180,18 +169,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(_dataTable.inArrayPtr, _dataTable.outArrayPtr); } - public void RunClsVarScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario)); - - var result = {Isa}.{Method}( - _clsVar - ); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(_clsVar, _dataTable.outArrayPtr); - } - public void RunLclVarScenario_UnsafeRead() { TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_UnsafeRead)); diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Shared/StoreBinOpTest.template b/src/tests/JIT/HardwareIntrinsics/X86/Shared/StoreBinOpTest.template index fb60432ccb737e..89fe271cab2964 100644 --- a/src/tests/JIT/HardwareIntrinsics/X86/Shared/StoreBinOpTest.template +++ b/src/tests/JIT/HardwareIntrinsics/X86/Shared/StoreBinOpTest.template @@ -42,9 +42,6 @@ namespace JIT.HardwareIntrinsics.X86 // Validates calling via reflection works, using Unsafe.Read test.RunReflectionScenario_UnsafeRead(); - // Validates passing a static member works - test.RunClsVarScenario(); - // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); @@ -108,22 +105,11 @@ namespace JIT.HardwareIntrinsics.X86 private static {Op1BaseType}[] _data1 = new {Op1BaseType}[Op1ElementCount]; private static {Op2BaseType}[] _data2 = new {Op2BaseType}[Op2ElementCount]; - private static {Op1VectorType}<{Op1BaseType}> _clsVar1; - private static {Op2VectorType}<{Op2BaseType}> _clsVar2; - private {Op1VectorType}<{Op1BaseType}> _fld1; private {Op2VectorType}<{Op2BaseType}> _fld2; private SimpleBinaryOpTest__DataTable<{RetBaseType}, {Op1BaseType}, {Op2BaseType}> _dataTable; - static StoreBinaryOpTest__{Method}{RetBaseType}() - { - for (var i = 0; i < Op1ElementCount; i++) { _data1[i] = {NextValueOp1}; } - Unsafe.CopyBlockUnaligned(ref Unsafe.As<{Op1VectorType}<{Op1BaseType}>, byte>(ref _clsVar1), ref Unsafe.As<{Op1BaseType}, byte>(ref _data1[0]), (uint)Unsafe.SizeOf<{Op1VectorType}<{Op1BaseType}>>()); - for (var i = 0; i < Op2ElementCount; i++) { _data2[i] = {NextValueOp2}; } - Unsafe.CopyBlockUnaligned(ref Unsafe.As<{Op2VectorType}<{Op2BaseType}>, byte>(ref _clsVar2), ref Unsafe.As<{Op2BaseType}, byte>(ref _data2[0]), (uint)Unsafe.SizeOf<{Op2VectorType}<{Op2BaseType}>>()); - } - public StoreBinaryOpTest__{Method}{RetBaseType}() { Succeeded = true; @@ -195,19 +181,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(_dataTable.inArray1Ptr, _dataTable.inArray2Ptr, _dataTable.outArrayPtr); } - public void RunClsVarScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario)); - - {Isa}.{Method}( - ({RetBaseType}*)_dataTable.outArrayPtr, - _clsVar1, - _clsVar2 - ); - - ValidateResult(_clsVar1, _clsVar2, _dataTable.outArrayPtr); - } - public void RunLclVarScenario_UnsafeRead() { TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_UnsafeRead)); diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Shared/StoreUnOpTest.template b/src/tests/JIT/HardwareIntrinsics/X86/Shared/StoreUnOpTest.template index 79092161cfd43d..56485461a6007c 100644 --- a/src/tests/JIT/HardwareIntrinsics/X86/Shared/StoreUnOpTest.template +++ b/src/tests/JIT/HardwareIntrinsics/X86/Shared/StoreUnOpTest.template @@ -42,9 +42,6 @@ namespace JIT.HardwareIntrinsics.X86 // Validates calling via reflection works, using Unsafe.Read test.RunReflectionScenario_UnsafeRead(); - // Validates passing a static member works - test.RunClsVarScenario(); - // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); @@ -103,18 +100,10 @@ namespace JIT.HardwareIntrinsics.X86 private static {Op1BaseType}[] _data1 = new {Op1BaseType}[Op1ElementCount]; - private static {Op1VectorType}<{Op1BaseType}> _clsVar1; - private {Op1VectorType}<{Op1BaseType}> _fld1; private SimpleUnaryOpTest__DataTable<{RetBaseType}, {Op1BaseType}> _dataTable; - static StoreUnaryOpTest__{Method}{RetBaseType}() - { - for (var i = 0; i < Op1ElementCount; i++) { _data1[i] = {NextValueOp1}; } - Unsafe.CopyBlockUnaligned(ref Unsafe.As<{Op1VectorType}<{Op1BaseType}>, byte>(ref _clsVar1), ref Unsafe.As<{Op1BaseType}, byte>(ref _data1[0]), (uint)Unsafe.SizeOf<{Op1VectorType}<{Op1BaseType}>>()); - } - public StoreUnaryOpTest__{Method}{RetBaseType}() { Succeeded = true; @@ -179,18 +168,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(_dataTable.inArrayPtr, _dataTable.outArrayPtr); } - public void RunClsVarScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario)); - - {Isa}.{Method}( - ({RetBaseType}*)_dataTable.outArrayPtr, - _clsVar1 - ); - - ValidateResult(_clsVar1, _dataTable.outArrayPtr); - } - public void RunLclVarScenario_UnsafeRead() { TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_UnsafeRead)); diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Shared/_BinaryOpTestTemplate.template b/src/tests/JIT/HardwareIntrinsics/X86/Shared/_BinaryOpTestTemplate.template index daa18b1d95e2df..fbfe8fde09763d 100644 --- a/src/tests/JIT/HardwareIntrinsics/X86/Shared/_BinaryOpTestTemplate.template +++ b/src/tests/JIT/HardwareIntrinsics/X86/Shared/_BinaryOpTestTemplate.template @@ -41,9 +41,6 @@ namespace JIT.HardwareIntrinsics.X86 // Validates calling via reflection works, using Unsafe.Read test.RunReflectionScenario_UnsafeRead(); - // Validates passing a static member works - test.RunClsVarScenario(); - // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); @@ -162,22 +159,11 @@ namespace JIT.HardwareIntrinsics.X86 private static {Op1BaseType}[] _data1 = new {Op1BaseType}[Op1ElementCount]; private static {Op2BaseType}[] _data2 = new {Op2BaseType}[Op2ElementCount]; - private static {Op1VectorType}<{Op1BaseType}> _clsVar1; - private static {Op2VectorType}<{Op2BaseType}> _clsVar2; - private {Op1VectorType}<{Op1BaseType}> _fld1; private {Op2VectorType}<{Op2BaseType}> _fld2; private DataTable _dataTable; - static {TemplateName}BinaryOpTest__{Method}{RetBaseType}() - { - for (var i = 0; i < Op1ElementCount; i++) { _data1[i] = {NextValueOp1}; } - Unsafe.CopyBlockUnaligned(ref Unsafe.As<{Op1VectorType}<{Op1BaseType}>, byte>(ref _clsVar1), ref Unsafe.As<{Op1BaseType}, byte>(ref _data1[0]), (uint)Unsafe.SizeOf<{Op1VectorType}<{Op1BaseType}>>()); - for (var i = 0; i < Op2ElementCount; i++) { _data2[i] = {NextValueOp2}; } - Unsafe.CopyBlockUnaligned(ref Unsafe.As<{Op2VectorType}<{Op2BaseType}>, byte>(ref _clsVar2), ref Unsafe.As<{Op2BaseType}, byte>(ref _data2[0]), (uint)Unsafe.SizeOf<{Op2VectorType}<{Op2BaseType}>>()); - } - public {TemplateName}BinaryOpTest__{Method}{RetBaseType}() { Succeeded = true; @@ -249,19 +235,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(_dataTable.inArray1Ptr, _dataTable.inArray2Ptr, _dataTable.outArrayPtr); } - public void RunClsVarScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario)); - - var result = {Isa}.{Method}( - _clsVar1, - _clsVar2 - ); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(_clsVar1, _clsVar2, _dataTable.outArrayPtr); - } - public void RunLclVarScenario_UnsafeRead() { TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_UnsafeRead)); diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Shared/_BooleanBinaryOpTestTemplate.template b/src/tests/JIT/HardwareIntrinsics/X86/Shared/_BooleanBinaryOpTestTemplate.template index 442a9e3cdd64ca..a5bde9c5e8ddb7 100644 --- a/src/tests/JIT/HardwareIntrinsics/X86/Shared/_BooleanBinaryOpTestTemplate.template +++ b/src/tests/JIT/HardwareIntrinsics/X86/Shared/_BooleanBinaryOpTestTemplate.template @@ -41,9 +41,6 @@ namespace JIT.HardwareIntrinsics.X86 // Validates calling via reflection works, using Unsafe.Read test.RunReflectionScenario_UnsafeRead(); - // Validates passing a static member works - test.RunClsVarScenario(); - // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); @@ -152,22 +149,11 @@ namespace JIT.HardwareIntrinsics.X86 private static {Op1BaseType}[] _data1 = new {Op1BaseType}[Op1ElementCount]; private static {Op2BaseType}[] _data2 = new {Op2BaseType}[Op2ElementCount]; - private static {Op1VectorType}<{Op1BaseType}> _clsVar1; - private static {Op2VectorType}<{Op2BaseType}> _clsVar2; - private {Op1VectorType}<{Op1BaseType}> _fld1; private {Op2VectorType}<{Op2BaseType}> _fld2; private DataTable _dataTable; - static {TemplateName}BinaryOpTest__{Method}{RetBaseType}() - { - for (var i = 0; i < Op1ElementCount; i++) { _data1[i] = {NextValueOp1}; } - Unsafe.CopyBlockUnaligned(ref Unsafe.As<{Op1VectorType}<{Op1BaseType}>, byte>(ref _clsVar1), ref Unsafe.As<{Op1BaseType}, byte>(ref _data1[0]), (uint)Unsafe.SizeOf<{Op1VectorType}<{Op1BaseType}>>()); - for (var i = 0; i < Op2ElementCount; i++) { _data2[i] = {NextValueOp2}; } - Unsafe.CopyBlockUnaligned(ref Unsafe.As<{Op2VectorType}<{Op2BaseType}>, byte>(ref _clsVar2), ref Unsafe.As<{Op2BaseType}, byte>(ref _data2[0]), (uint)Unsafe.SizeOf<{Op2VectorType}<{Op2BaseType}>>()); - } - public {TemplateName}BinaryOpTest__{Method}{RetBaseType}() { Succeeded = true; @@ -235,18 +221,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(_dataTable.inArray1Ptr, _dataTable.inArray2Ptr, (bool)(result)); } - public void RunClsVarScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario)); - - var result = {Isa}.{Method}( - _clsVar1, - _clsVar2 - ); - - ValidateResult(_clsVar1, _clsVar2, result); - } - public void RunLclVarScenario_UnsafeRead() { TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_UnsafeRead)); diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Shared/_BooleanUnaryOpTestTemplate.template b/src/tests/JIT/HardwareIntrinsics/X86/Shared/_BooleanUnaryOpTestTemplate.template index 848e13ac749265..244c4e2b853e9c 100644 --- a/src/tests/JIT/HardwareIntrinsics/X86/Shared/_BooleanUnaryOpTestTemplate.template +++ b/src/tests/JIT/HardwareIntrinsics/X86/Shared/_BooleanUnaryOpTestTemplate.template @@ -41,9 +41,6 @@ namespace JIT.HardwareIntrinsics.X86 // Validates calling via reflection works, using Unsafe.Read test.RunReflectionScenario_UnsafeRead(); - // Validates passing a static member works - test.RunClsVarScenario(); - // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); @@ -139,18 +136,10 @@ namespace JIT.HardwareIntrinsics.X86 private static {Op1BaseType}[] _data1 = new {Op1BaseType}[Op1ElementCount]; - private static {Op1VectorType}<{Op1BaseType}> _clsVar1; - private {Op1VectorType}<{Op1BaseType}> _fld1; private DataTable _dataTable; - static {TemplateName}UnaryOpTest__{Method}{RetBaseType}() - { - for (var i = 0; i < Op1ElementCount; i++) { _data1[i] = {NextValueOp1}; } - Unsafe.CopyBlockUnaligned(ref Unsafe.As<{Op1VectorType}<{Op1BaseType}>, byte>(ref _clsVar1), ref Unsafe.As<{Op1BaseType}, byte>(ref _data1[0]), (uint)Unsafe.SizeOf<{Op1VectorType}<{Op1BaseType}>>()); - } - public {TemplateName}UnaryOpTest__{Method}{RetBaseType}() { Succeeded = true; @@ -211,17 +200,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(_dataTable.inArray1Ptr, (bool)(result)); } - public void RunClsVarScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario)); - - var result = {Isa}.{Method}( - _clsVar1 - ); - - ValidateResult(_clsVar1, result); - } - public void RunLclVarScenario_UnsafeRead() { TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_UnsafeRead)); diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Shared/_TernaryOpTestTemplate.template b/src/tests/JIT/HardwareIntrinsics/X86/Shared/_TernaryOpTestTemplate.template index 468fb019b49f50..73f964e491a0e9 100644 --- a/src/tests/JIT/HardwareIntrinsics/X86/Shared/_TernaryOpTestTemplate.template +++ b/src/tests/JIT/HardwareIntrinsics/X86/Shared/_TernaryOpTestTemplate.template @@ -41,9 +41,6 @@ namespace JIT.HardwareIntrinsics.X86 // Validates calling via reflection works, using Unsafe.Read test.RunReflectionScenario_UnsafeRead(); - // Validates passing a static member works - test.RunClsVarScenario(); - // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); @@ -175,26 +172,12 @@ namespace JIT.HardwareIntrinsics.X86 private static {Op2BaseType}[] _data2 = new {Op2BaseType}[Op2ElementCount]; private static {Op3BaseType}[] _data3 = new {Op3BaseType}[Op3ElementCount]; - private static {Op1VectorType}<{Op1BaseType}> _clsVar1; - private static {Op2VectorType}<{Op2BaseType}> _clsVar2; - private static {Op3VectorType}<{Op3BaseType}> _clsVar3; - private {Op1VectorType}<{Op1BaseType}> _fld1; private {Op2VectorType}<{Op2BaseType}> _fld2; private {Op3VectorType}<{Op3BaseType}> _fld3; private DataTable _dataTable; - static {TemplateName}TernaryOpTest__{Method}{RetBaseType}() - { - for (var i = 0; i < Op1ElementCount; i++) { _data1[i] = {NextValueOp1}; } - Unsafe.CopyBlockUnaligned(ref Unsafe.As<{Op1VectorType}<{Op1BaseType}>, byte>(ref _clsVar1), ref Unsafe.As<{Op1BaseType}, byte>(ref _data1[0]), (uint)Unsafe.SizeOf<{Op1VectorType}<{Op1BaseType}>>()); - for (var i = 0; i < Op2ElementCount; i++) { _data2[i] = {NextValueOp2}; } - Unsafe.CopyBlockUnaligned(ref Unsafe.As<{Op2VectorType}<{Op2BaseType}>, byte>(ref _clsVar2), ref Unsafe.As<{Op2BaseType}, byte>(ref _data2[0]), (uint)Unsafe.SizeOf<{Op2VectorType}<{Op2BaseType}>>()); - for (var i = 0; i < Op3ElementCount; i++) { _data3[i] = {NextValueOp3}; } - Unsafe.CopyBlockUnaligned(ref Unsafe.As<{Op3VectorType}<{Op3BaseType}>, byte>(ref _clsVar3), ref Unsafe.As<{Op3BaseType}, byte>(ref _data3[0]), (uint)Unsafe.SizeOf<{Op3VectorType}<{Op3BaseType}>>()); - } - public {TemplateName}TernaryOpTest__{Method}{RetBaseType}() { Succeeded = true; @@ -273,20 +256,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(_dataTable.inArray1Ptr, _dataTable.inArray2Ptr, _dataTable.inArray3Ptr, _dataTable.outArrayPtr); } - public void RunClsVarScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario)); - - var result = {Isa}.{Method}( - _clsVar1, - _clsVar2, - _clsVar3 - ); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(_clsVar1, _clsVar2, _clsVar3, _dataTable.outArrayPtr); - } - public void RunLclVarScenario_UnsafeRead() { TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_UnsafeRead)); diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Shared/_UnaryOpTestTemplate.template b/src/tests/JIT/HardwareIntrinsics/X86/Shared/_UnaryOpTestTemplate.template index d3fba4058951bd..2de7f67baeda2e 100644 --- a/src/tests/JIT/HardwareIntrinsics/X86/Shared/_UnaryOpTestTemplate.template +++ b/src/tests/JIT/HardwareIntrinsics/X86/Shared/_UnaryOpTestTemplate.template @@ -41,9 +41,6 @@ namespace JIT.HardwareIntrinsics.X86 // Validates calling via reflection works, using Unsafe.Read test.RunReflectionScenario_UnsafeRead(); - // Validates passing a static member works - test.RunClsVarScenario(); - // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); @@ -149,18 +146,10 @@ namespace JIT.HardwareIntrinsics.X86 private static {Op1BaseType}[] _data1 = new {Op1BaseType}[Op1ElementCount]; - private static {Op1VectorType}<{Op1BaseType}> _clsVar1; - private {Op1VectorType}<{Op1BaseType}> _fld1; private DataTable _dataTable; - static {TemplateName}UnaryOpTest__{Method}{RetBaseType}() - { - for (var i = 0; i < Op1ElementCount; i++) { _data1[i] = {NextValueOp1}; } - Unsafe.CopyBlockUnaligned(ref Unsafe.As<{Op1VectorType}<{Op1BaseType}>, byte>(ref _clsVar1), ref Unsafe.As<{Op1BaseType}, byte>(ref _data1[0]), (uint)Unsafe.SizeOf<{Op1VectorType}<{Op1BaseType}>>()); - } - public {TemplateName}UnaryOpTest__{Method}{RetBaseType}() { Succeeded = true; @@ -225,18 +214,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(_dataTable.inArray1Ptr, _dataTable.outArrayPtr); } - public void RunClsVarScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClsVarScenario)); - - var result = {Isa}.{Method}( - _clsVar1 - ); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(_clsVar1, _dataTable.outArrayPtr); - } - public void RunLclVarScenario_UnsafeRead() { TestLibrary.TestFramework.BeginScenario(nameof(RunLclVarScenario_UnsafeRead)); From 7a5698287ab9652e5e4b10d7cb3d6218fbdb473d Mon Sep 17 00:00:00 2001 From: Tanner Gooding Date: Tue, 18 Apr 2023 17:59:59 -0700 Subject: [PATCH 03/10] Removing ClassLclFld scenarios from the HWIntrinsic test templates --- .../Arm/Shared/AesBinOpTest.template | 14 -------------- .../Arm/Shared/AesUnOpTest.template | 14 -------------- .../Arm/Shared/ExtractTest.template | 13 ------------- .../Arm/Shared/ExtractVectorTest.template | 14 -------------- .../Arm/Shared/InsertScalarTest.template | 14 -------------- .../Shared/InsertSelectedScalarTest.template | 14 -------------- .../Arm/Shared/InsertTest.template | 14 -------------- .../Arm/Shared/LoadAndInsertScalarTest.template | 17 ----------------- .../Arm/Shared/LoadPairVectorTest.template | 14 -------------- .../Arm/Shared/ScalarBinOpTest.template | 13 ------------- .../Arm/Shared/ScalarUnOpTest.template | 13 ------------- .../Arm/Shared/StoreBinOpTest.template | 13 ------------- .../Arm/Shared/StoreSelectedScalarTest.template | 13 ------------- .../Arm/Shared/StoreUnOpTest.template | 13 ------------- .../Shared/VectorLookupExtension_2Test.template | 14 -------------- .../Shared/VectorLookupExtension_3Test.template | 14 -------------- .../Shared/VectorLookupExtension_4Test.template | 14 -------------- .../Arm/Shared/VectorLookup_2Test.template | 14 -------------- .../Arm/Shared/VectorLookup_3Test.template | 14 -------------- .../Arm/Shared/VectorLookup_4Test.template | 14 -------------- .../Arm/Shared/_BinaryOpTestTemplate.template | 14 -------------- .../Shared/_ImmBinaryOpTestTemplate.template | 14 -------------- .../Shared/_ImmTernaryOpTestTemplate.template | 14 -------------- .../Arm/Shared/_ImmUnaryOpTestTemplate.template | 14 -------------- .../Arm/Shared/_TernaryOpTestTemplate.template | 14 -------------- .../Shared/_UnaryOpScalarTestTemplate.template | 14 -------------- .../Arm/Shared/_UnaryOpTestTemplate.template | 14 -------------- .../X86/Shared/AesBinOpTest.template | 14 -------------- .../X86/Shared/AesImmOpTest.template | 14 -------------- .../X86/Shared/AesUnOpTest.template | 14 -------------- .../X86/Shared/ExtractScalarTest.template | 14 -------------- .../X86/Shared/ExtractVector128Test.template | 14 -------------- .../X86/Shared/GenericUnOpTest.template | 14 -------------- .../X86/Shared/ImmBinOpTest.template | 14 -------------- .../X86/Shared/ImmUnOpTest.template | 14 -------------- .../X86/Shared/InsertScalarTest.template | 14 -------------- .../X86/Shared/InsertVector128Test.template | 14 -------------- .../X86/Shared/LoadBinOpTest.template | 14 -------------- .../X86/Shared/PclmulqdqOpTest.template | 14 -------------- .../X86/Shared/ScalarBinOpTest.template | 13 ------------- .../X86/Shared/ScalarSimdUnOpTest.template | 14 -------------- .../X86/Shared/ScalarTernOpBinResTest.template | 15 --------------- .../X86/Shared/ScalarTernOpTest.template | 13 ------------- .../Shared/ScalarTernOpTupleBinRetTest.template | 13 ------------- .../X86/Shared/ScalarUnOpTest.template | 13 ------------- .../X86/Shared/SimdScalarUnOpConvTest.template | 13 ------------- .../X86/Shared/SimdScalarUnOpTest.template | 13 ------------- .../X86/Shared/SimpleBinOpConvTest.template | 14 -------------- .../X86/Shared/SimpleUnOpConvTest.template | 14 -------------- .../X86/Shared/StoreBinOpTest.template | 13 ------------- .../X86/Shared/StoreUnOpTest.template | 13 ------------- .../X86/Shared/_BinaryOpTestTemplate.template | 14 -------------- .../_BooleanBinaryOpTestTemplate.template | 13 ------------- .../Shared/_BooleanUnaryOpTestTemplate.template | 13 ------------- .../X86/Shared/_TernaryOpTestTemplate.template | 14 -------------- .../X86/Shared/_UnaryOpTestTemplate.template | 14 -------------- 56 files changed, 772 deletions(-) diff --git a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/AesBinOpTest.template b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/AesBinOpTest.template index 15e9553d2de89e..3a3a64b1b88c34 100644 --- a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/AesBinOpTest.template +++ b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/AesBinOpTest.template @@ -41,9 +41,6 @@ namespace JIT.HardwareIntrinsics.Arm // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); - // Validates passing the field of a local class works - test.RunClassLclFldScenario(); - // Validates passing an instance member of a class works test.RunClassFldScenario(); @@ -227,17 +224,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(_dataTable.outArrayPtr); } - public void RunClassLclFldScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario)); - - var test = new AesBinaryOpTest__{TestName}(); - var result = {Isa}.{Method}(test._fld1, test._fld2); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(_dataTable.outArrayPtr); - } - public void RunClassFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassFldScenario)); diff --git a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/AesUnOpTest.template b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/AesUnOpTest.template index 4c74b236d36614..c466d0c18645e4 100644 --- a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/AesUnOpTest.template +++ b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/AesUnOpTest.template @@ -41,9 +41,6 @@ namespace JIT.HardwareIntrinsics.Arm // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); - // Validates passing the field of a local class works - test.RunClassLclFldScenario(); - // Validates passing an instance member of a class works test.RunClassFldScenario(); @@ -208,17 +205,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(_dataTable.outArrayPtr); } - public void RunClassLclFldScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario)); - - var test = new AesUnaryOpTest__{TestName}(); - var result = {Isa}.{Method}(test._fld); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(_dataTable.outArrayPtr); - } - public void RunClassFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassFldScenario)); diff --git a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/ExtractTest.template b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/ExtractTest.template index b9bde14eb23608..e141a6f4528d46 100644 --- a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/ExtractTest.template +++ b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/ExtractTest.template @@ -41,9 +41,6 @@ namespace JIT.HardwareIntrinsics.Arm // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); - // Validates passing the field of a local class works - test.RunClassLclFldScenario(); - // Validates passing an instance member of a class works test.RunClassFldScenario(); @@ -200,16 +197,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(op1, result); } - public void RunClassLclFldScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario)); - - var test = new ExtractTest__{TestName}(); - var result = {Isa}.{Method}(test._fld1, ElementIndex); - - ValidateResult(test._fld1, result); - } - public void RunClassFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassFldScenario)); diff --git a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/ExtractVectorTest.template b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/ExtractVectorTest.template index 4f68894e4f394c..fcac6c0fd3bab5 100644 --- a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/ExtractVectorTest.template +++ b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/ExtractVectorTest.template @@ -41,9 +41,6 @@ namespace JIT.HardwareIntrinsics.Arm // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); - // Validates passing the field of a local class works - test.RunClassLclFldScenario(); - // Validates passing an instance member of a class works test.RunClassFldScenario(); @@ -235,17 +232,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(op1, op2, _dataTable.outArrayPtr); } - public void RunClassLclFldScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario)); - - var test = new ExtractVectorTest__{TestName}(); - var result = {Isa}.{Method}(test._fld1, test._fld2, ElementIndex); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(test._fld1, test._fld2, _dataTable.outArrayPtr); - } - public void RunClassFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassFldScenario)); diff --git a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/InsertScalarTest.template b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/InsertScalarTest.template index 7bdd479a1abcd6..8697ae3fe1a24c 100644 --- a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/InsertScalarTest.template +++ b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/InsertScalarTest.template @@ -41,9 +41,6 @@ namespace JIT.HardwareIntrinsics.Arm // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); - // Validates passing the field of a local class works - test.RunClassLclFldScenario(); - // Validates passing an instance member of a class works test.RunClassFldScenario(); @@ -235,17 +232,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(op1, op3, _dataTable.outArrayPtr); } - public void RunClassLclFldScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario)); - - var test = new InsertScalarTest__{TestName}(); - var result = {Isa}.{Method}(test._fld1, {ElementIndex}, test._fld3); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(test._fld1, test._fld3, _dataTable.outArrayPtr); - } - public void RunClassFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassFldScenario)); diff --git a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/InsertSelectedScalarTest.template b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/InsertSelectedScalarTest.template index 40df927f800429..2a5b44393d7dde 100644 --- a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/InsertSelectedScalarTest.template +++ b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/InsertSelectedScalarTest.template @@ -41,9 +41,6 @@ namespace JIT.HardwareIntrinsics.Arm // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); - // Validates passing the field of a local class works - test.RunClassLclFldScenario(); - // Validates passing an instance member of a class works test.RunClassFldScenario(); @@ -239,17 +236,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(op1, op3, _dataTable.outArrayPtr); } - public void RunClassLclFldScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario)); - - var test = new InsertSelectedScalarTest__{TestName}(); - var result = {Isa}.{Method}(test._fld1, {ElementIndex1}, test._fld3, {ElementIndex2}); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(test._fld1, test._fld3, _dataTable.outArrayPtr); - } - public void RunClassFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassFldScenario)); diff --git a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/InsertTest.template b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/InsertTest.template index 60c4d89251b2bd..ed766212e437df 100644 --- a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/InsertTest.template +++ b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/InsertTest.template @@ -41,9 +41,6 @@ namespace JIT.HardwareIntrinsics.Arm // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); - // Validates passing the field of a local class works - test.RunClassLclFldScenario(); - // Validates passing an instance member of a class works test.RunClassFldScenario(); @@ -227,17 +224,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(op1, op3, _dataTable.outArrayPtr); } - public void RunClassLclFldScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario)); - - var test = new InsertTest__{TestName}(); - var result = {Isa}.{Method}(test._fld1, ElementIndex, test._fld3); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(test._fld1, test._fld3, _dataTable.outArrayPtr); - } - public void RunClassFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassFldScenario)); diff --git a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/LoadAndInsertScalarTest.template b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/LoadAndInsertScalarTest.template index 2be19c885fc1b2..f74ef42e057e92 100644 --- a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/LoadAndInsertScalarTest.template +++ b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/LoadAndInsertScalarTest.template @@ -42,9 +42,6 @@ namespace JIT.HardwareIntrinsics.Arm // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); - // Validates passing the field of a local class works - test.RunClassLclFldScenario(); - // Validates passing an instance member of a class works test.RunClassFldScenario(); @@ -236,20 +233,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(op1, op3, _dataTable.outArrayPtr); } - public void RunClassLclFldScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario)); - - var test = new LoadAndInsertTest__{TestName}(); - fixed ({Op1BaseType}* pFld3 = &test._fld3) - { - var result = {Isa}.{Method}(test._fld1, {ElementIndex}, pFld3); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(test._fld1, test._fld3, _dataTable.outArrayPtr); - } - } - public void RunClassFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassFldScenario)); diff --git a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/LoadPairVectorTest.template b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/LoadPairVectorTest.template index f69de31a21333f..01229a242cd964 100644 --- a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/LoadPairVectorTest.template +++ b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/LoadPairVectorTest.template @@ -33,9 +33,6 @@ namespace JIT.HardwareIntrinsics.Arm // Validates calling via reflection works test.RunReflectionScenario(); - // Validates loading to the field of a local class works - test.RunClassLclFldScenario(); - // Validates loading to the field of a local struct works test.RunStructLclFldScenario(); @@ -166,17 +163,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(_dataTable.inArrayPtr, _dataTable.outArrayPtr); } - public void RunClassLclFldScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario)); - - var test = new {TestName}(); - test._fld = {Isa}.{Method}(({Op1BaseType}*)(_dataTable.inArrayPtr)); - - Unsafe.Write(_dataTable.outArrayPtr, test._fld); - ValidateResult(_dataTable.inArrayPtr, _dataTable.outArrayPtr); - } - public void RunStructLclFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunStructLclFldScenario)); diff --git a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/ScalarBinOpTest.template b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/ScalarBinOpTest.template index c50d9023bcacb0..95e16fbd710423 100644 --- a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/ScalarBinOpTest.template +++ b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/ScalarBinOpTest.template @@ -35,9 +35,6 @@ namespace JIT.HardwareIntrinsics.Arm // Validates passing a local works, using Unsafe.ReadUnaligned test.RunLclVarScenario_UnsafeRead(); - // Validates passing the field of a local class works - test.RunClassLclFldScenario(); - // Validates passing an instance member of a class works test.RunClassFldScenario(); @@ -141,16 +138,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(data1, data2, result); } - public void RunClassLclFldScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario)); - - var test = new ScalarBinaryOpTest__{TestName}(); - var result = {Isa}.{Method}(test._fld1, test._fld2); - - ValidateResult(test._fld1, test._fld2, result); - } - public void RunClassFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassFldScenario)); diff --git a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/ScalarUnOpTest.template b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/ScalarUnOpTest.template index df700566d5ef4d..c6fe68908e5627 100644 --- a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/ScalarUnOpTest.template +++ b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/ScalarUnOpTest.template @@ -35,9 +35,6 @@ namespace JIT.HardwareIntrinsics.Arm // Validates passing a local works, using Unsafe.ReadUnaligned test.RunLclVarScenario_UnsafeRead(); - // Validates passing the field of a local class works - test.RunClassLclFldScenario(); - // Validates passing an instance member of a class works test.RunClassFldScenario(); @@ -131,16 +128,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(data, result); } - public void RunClassLclFldScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario)); - - var test = new ScalarUnaryOpTest__{TestName}(); - var result = {Isa}.{Method}(test._fld); - - ValidateResult(test._fld, result); - } - public void RunClassFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassFldScenario)); diff --git a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/StoreBinOpTest.template b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/StoreBinOpTest.template index 500b8b057ec9a4..8c539c7865b4fa 100644 --- a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/StoreBinOpTest.template +++ b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/StoreBinOpTest.template @@ -42,9 +42,6 @@ namespace JIT.HardwareIntrinsics.Arm // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); - // Validates passing the field of a local class works - test.RunClassLclFldScenario(); - // Validates passing an instance member of a class works test.RunClassFldScenario(); @@ -228,16 +225,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(op1, op2, _dataTable.outArrayPtr); } - public void RunClassLclFldScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario)); - - var test = new StoreBinaryOpTest__{TestName}(); - {Isa}.{Method}(({RetBaseType}*)_dataTable.outArrayPtr, test._fld1, test._fld2); - - ValidateResult(test._fld1, test._fld2, _dataTable.outArrayPtr); - } - public void RunClassFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassFldScenario)); diff --git a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/StoreSelectedScalarTest.template b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/StoreSelectedScalarTest.template index 3a1268ce8e0140..918616f32b51d8 100644 --- a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/StoreSelectedScalarTest.template +++ b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/StoreSelectedScalarTest.template @@ -42,9 +42,6 @@ namespace JIT.HardwareIntrinsics.Arm // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); - // Validates passing the field of a local class works - test.RunClassLclFldScenario(); - // Validates passing an instance member of a class works test.RunClassFldScenario(); @@ -204,16 +201,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(op1, _dataTable.outArrayPtr); } - public void RunClassLclFldScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario)); - - var test = new StoreSelectedScalarTest__{TestName}(); - {Isa}.{Method}(({RetBaseType}*)_dataTable.outArrayPtr, test._fld1, {ElementIndex}); - - ValidateResult(test._fld1, _dataTable.outArrayPtr); - } - public void RunClassFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassFldScenario)); diff --git a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/StoreUnOpTest.template b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/StoreUnOpTest.template index 51498a39652a75..da8f91f1f53bb1 100644 --- a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/StoreUnOpTest.template +++ b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/StoreUnOpTest.template @@ -42,9 +42,6 @@ namespace JIT.HardwareIntrinsics.Arm // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); - // Validates passing the field of a local class works - test.RunClassLclFldScenario(); - // Validates passing an instance member of a class works test.RunClassFldScenario(); @@ -202,16 +199,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(op1, _dataTable.outArrayPtr); } - public void RunClassLclFldScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario)); - - var test = new StoreUnaryOpTest__{TestName}(); - {Isa}.{Method}(({RetBaseType}*)_dataTable.outArrayPtr, test._fld1); - - ValidateResult(test._fld1, _dataTable.outArrayPtr); - } - public void RunClassFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassFldScenario)); diff --git a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/VectorLookupExtension_2Test.template b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/VectorLookupExtension_2Test.template index 703fa48c46bd80..95574352689e2b 100644 --- a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/VectorLookupExtension_2Test.template +++ b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/VectorLookupExtension_2Test.template @@ -34,9 +34,6 @@ namespace JIT.HardwareIntrinsics.Arm // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); - // Validates passing the field of a local class works - test.RunClassLclFldScenario(); - // Validates passing an instance member of a class works test.RunClassFldScenario(); @@ -258,17 +255,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(op0, op1, op2, op3, _dataTable.outArrayPtr); } - public void RunClassLclFldScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario)); - - var test = new VectorLookupExtension_2Test__{Method}{RetBaseType}(); - var result = {Isa}.{Method}(test._fld0, (test._fld1, test._fld2), test._fld3); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(test._fld0, test._fld1, test._fld2, test._fld3, _dataTable.outArrayPtr); - } - public void RunClassFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassFldScenario)); diff --git a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/VectorLookupExtension_3Test.template b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/VectorLookupExtension_3Test.template index 6f1b7def59b746..9fc5bed8818acc 100644 --- a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/VectorLookupExtension_3Test.template +++ b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/VectorLookupExtension_3Test.template @@ -34,9 +34,6 @@ namespace JIT.HardwareIntrinsics.Arm // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); - // Validates passing the field of a local class works - test.RunClassLclFldScenario(); - // Validates passing an instance member of a class works test.RunClassFldScenario(); @@ -276,17 +273,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(op0, op1, op2, op3, op4, _dataTable.outArrayPtr); } - public void RunClassLclFldScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario)); - - var test = new VectorLookupExtension_3Test__{Method}{RetBaseType}(); - var result = {Isa}.{Method}(test._fld0, (test._fld1, test._fld2, test._fld3), test._fld4); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(test._fld0, test._fld1, test._fld2, test._fld3, test._fld4, _dataTable.outArrayPtr); - } - public void RunClassFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassFldScenario)); diff --git a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/VectorLookupExtension_4Test.template b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/VectorLookupExtension_4Test.template index 04070807532c05..cf88f29ed5d9ad 100644 --- a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/VectorLookupExtension_4Test.template +++ b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/VectorLookupExtension_4Test.template @@ -34,9 +34,6 @@ namespace JIT.HardwareIntrinsics.Arm // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); - // Validates passing the field of a local class works - test.RunClassLclFldScenario(); - // Validates passing an instance member of a class works test.RunClassFldScenario(); @@ -294,17 +291,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(op0, op1, op2, op3, op4, op5, _dataTable.outArrayPtr); } - public void RunClassLclFldScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario)); - - var test = new VectorLookupExtension_4Test__{Method}{RetBaseType}(); - var result = {Isa}.{Method}(test._fld0, (test._fld1, test._fld2, test._fld3, test._fld4), test._fld5); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(test._fld0, test._fld1, test._fld2, test._fld3, test._fld4, test._fld5, _dataTable.outArrayPtr); - } - public void RunClassFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassFldScenario)); diff --git a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/VectorLookup_2Test.template b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/VectorLookup_2Test.template index e9684215a73225..976885162379c9 100644 --- a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/VectorLookup_2Test.template +++ b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/VectorLookup_2Test.template @@ -34,9 +34,6 @@ namespace JIT.HardwareIntrinsics.Arm // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); - // Validates passing the field of a local class works - test.RunClassLclFldScenario(); - // Validates passing an instance member of a class works test.RunClassFldScenario(); @@ -238,17 +235,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(op1, op2, op3, _dataTable.outArrayPtr); } - public void RunClassLclFldScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario)); - - var test = new VectorLookup_2Test__{Method}{RetBaseType}(); - var result = {Isa}.{Method}((test._fld1, test._fld2), test._fld3); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(test._fld1, test._fld2, test._fld3, _dataTable.outArrayPtr); - } - public void RunClassFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassFldScenario)); diff --git a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/VectorLookup_3Test.template b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/VectorLookup_3Test.template index 02fee0f83db141..1cf097dd61e24e 100644 --- a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/VectorLookup_3Test.template +++ b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/VectorLookup_3Test.template @@ -34,9 +34,6 @@ namespace JIT.HardwareIntrinsics.Arm // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); - // Validates passing the field of a local class works - test.RunClassLclFldScenario(); - // Validates passing an instance member of a class works test.RunClassFldScenario(); @@ -256,17 +253,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(op1, op2, op3, op4, _dataTable.outArrayPtr); } - public void RunClassLclFldScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario)); - - var test = new VectorLookup_3Test__{Method}{RetBaseType}(); - var result = {Isa}.{Method}((test._fld1, test._fld2, test._fld3), test._fld4); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(test._fld1, test._fld2, test._fld3, test._fld4, _dataTable.outArrayPtr); - } - public void RunClassFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassFldScenario)); diff --git a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/VectorLookup_4Test.template b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/VectorLookup_4Test.template index fc50e937948477..d089eaf82365fe 100644 --- a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/VectorLookup_4Test.template +++ b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/VectorLookup_4Test.template @@ -34,9 +34,6 @@ namespace JIT.HardwareIntrinsics.Arm // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); - // Validates passing the field of a local class works - test.RunClassLclFldScenario(); - // Validates passing an instance member of a class works test.RunClassFldScenario(); @@ -274,17 +271,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(op1, op2, op3, op4, op5, _dataTable.outArrayPtr); } - public void RunClassLclFldScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario)); - - var test = new VectorLookup_4Test__{Method}{RetBaseType}(); - var result = {Isa}.{Method}((test._fld1, test._fld2, test._fld3, test._fld4), test._fld5); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(test._fld1, test._fld2, test._fld3, test._fld4, test._fld5, _dataTable.outArrayPtr); - } - public void RunClassFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassFldScenario)); diff --git a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/_BinaryOpTestTemplate.template b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/_BinaryOpTestTemplate.template index 41b7fbba6a3d30..a75fbb9480f3f3 100644 --- a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/_BinaryOpTestTemplate.template +++ b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/_BinaryOpTestTemplate.template @@ -41,9 +41,6 @@ namespace JIT.HardwareIntrinsics.Arm // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); - // Validates passing the field of a local class works - test.RunClassLclFldScenario(); - // Validates passing an instance member of a class works test.RunClassFldScenario(); @@ -231,17 +228,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(op1, op2, _dataTable.outArrayPtr); } - public void RunClassLclFldScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario)); - - var test = new {TemplateName}BinaryOpTest__{TestName}(); - var result = {Isa}.{Method}(test._fld1, test._fld2); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(test._fld1, test._fld2, _dataTable.outArrayPtr); - } - public void RunClassFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassFldScenario)); diff --git a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/_ImmBinaryOpTestTemplate.template b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/_ImmBinaryOpTestTemplate.template index a1e14b507bfbc9..2563b1fd5c5e9f 100644 --- a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/_ImmBinaryOpTestTemplate.template +++ b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/_ImmBinaryOpTestTemplate.template @@ -41,9 +41,6 @@ namespace JIT.HardwareIntrinsics.Arm // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); - // Validates passing the field of a local class works - test.RunClassLclFldScenario(); - // Validates passing an instance member of a class works test.RunClassFldScenario(); @@ -235,17 +232,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(op1, op2, _dataTable.outArrayPtr); } - public void RunClassLclFldScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario)); - - var test = new ImmBinaryOpTest__{TestName}(); - var result = {Isa}.{Method}(test._fld1, test._fld2, {Imm}); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(test._fld1, test._fld2, _dataTable.outArrayPtr); - } - public void RunClassFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassFldScenario)); diff --git a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/_ImmTernaryOpTestTemplate.template b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/_ImmTernaryOpTestTemplate.template index a141246d0b8392..bef93f71f678a8 100644 --- a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/_ImmTernaryOpTestTemplate.template +++ b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/_ImmTernaryOpTestTemplate.template @@ -41,9 +41,6 @@ namespace JIT.HardwareIntrinsics.Arm // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); - // Validates passing the field of a local class works - test.RunClassLclFldScenario(); - // Validates passing an instance member of a class works test.RunClassFldScenario(); @@ -256,17 +253,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(op1, op2, op3, _dataTable.outArrayPtr); } - public void RunClassLclFldScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario)); - - var test = new {TemplateName}TernaryOpTest__{TestName}(); - var result = {Isa}.{Method}(test._fld1, test._fld2, test._fld3, {Imm}); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(test._fld1, test._fld2, test._fld3, _dataTable.outArrayPtr); - } - public void RunClassFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassFldScenario)); diff --git a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/_ImmUnaryOpTestTemplate.template b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/_ImmUnaryOpTestTemplate.template index b6733ad81061ba..71d1562a947b76 100644 --- a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/_ImmUnaryOpTestTemplate.template +++ b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/_ImmUnaryOpTestTemplate.template @@ -41,9 +41,6 @@ namespace JIT.HardwareIntrinsics.Arm // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); - // Validates passing the field of a local class works - test.RunClassLclFldScenario(); - // Validates passing an instance member of a class works test.RunClassFldScenario(); @@ -214,17 +211,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(firstOp, _dataTable.outArrayPtr); } - public void RunClassLclFldScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario)); - - var test = new {TemplateName}UnaryOpTest__{TestName}(); - var result = {Isa}.{Method}(test._fld, {Imm}); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(test._fld, _dataTable.outArrayPtr); - } - public void RunClassFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassFldScenario)); diff --git a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/_TernaryOpTestTemplate.template b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/_TernaryOpTestTemplate.template index 316fa6084fa084..24fa91288ac924 100644 --- a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/_TernaryOpTestTemplate.template +++ b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/_TernaryOpTestTemplate.template @@ -41,9 +41,6 @@ namespace JIT.HardwareIntrinsics.Arm // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); - // Validates passing the field of a local class works - test.RunClassLclFldScenario(); - // Validates passing an instance member of a class works test.RunClassFldScenario(); @@ -252,17 +249,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(op1, op2, op3, _dataTable.outArrayPtr); } - public void RunClassLclFldScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario)); - - var test = new {TemplateName}TernaryOpTest__{TestName}(); - var result = {Isa}.{Method}(test._fld1, test._fld2, test._fld3); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(test._fld1, test._fld2, test._fld3, _dataTable.outArrayPtr); - } - public void RunClassFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassFldScenario)); diff --git a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/_UnaryOpScalarTestTemplate.template b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/_UnaryOpScalarTestTemplate.template index dc461ababdbeae..9e46279abc32a4 100644 --- a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/_UnaryOpScalarTestTemplate.template +++ b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/_UnaryOpScalarTestTemplate.template @@ -35,9 +35,6 @@ namespace JIT.HardwareIntrinsics.Arm // Validates passing a local works, using Unsafe.ReadUnaligned test.RunLclVarScenario_UnsafeRead(); - // Validates passing the field of a local class works - test.RunClassLclFldScenario(); - // Validates passing an instance member of a class works test.RunClassFldScenario(); @@ -177,17 +174,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(data, _dataTable.outArrayPtr); } - public void RunClassLclFldScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario)); - - var test = new {TemplateName}UnaryOpTest__{TestName}(); - var result = {Isa}.{Method}(test._fld); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(test._fld, _dataTable.outArrayPtr); - } - public void RunClassFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassFldScenario)); diff --git a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/_UnaryOpTestTemplate.template b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/_UnaryOpTestTemplate.template index 44fe5dbaf74bda..7f991df4a4a6b6 100644 --- a/src/tests/JIT/HardwareIntrinsics/Arm/Shared/_UnaryOpTestTemplate.template +++ b/src/tests/JIT/HardwareIntrinsics/Arm/Shared/_UnaryOpTestTemplate.template @@ -41,9 +41,6 @@ namespace JIT.HardwareIntrinsics.Arm // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); - // Validates passing the field of a local class works - test.RunClassLclFldScenario(); - // Validates passing an instance member of a class works test.RunClassFldScenario(); @@ -210,17 +207,6 @@ namespace JIT.HardwareIntrinsics.Arm ValidateResult(op1, _dataTable.outArrayPtr); } - public void RunClassLclFldScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario)); - - var test = new {TemplateName}UnaryOpTest__{TestName}(); - var result = {Isa}.{Method}(test._fld1); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(test._fld1, _dataTable.outArrayPtr); - } - public void RunClassFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassFldScenario)); diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Shared/AesBinOpTest.template b/src/tests/JIT/HardwareIntrinsics/X86/Shared/AesBinOpTest.template index 4a03ec5058924f..bf0d615a214f3e 100644 --- a/src/tests/JIT/HardwareIntrinsics/X86/Shared/AesBinOpTest.template +++ b/src/tests/JIT/HardwareIntrinsics/X86/Shared/AesBinOpTest.template @@ -44,9 +44,6 @@ namespace JIT.HardwareIntrinsics.X86 // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); - // Validates passing the field of a local class works - test.RunClassLclFldScenario(); - // Validates passing an instance member of a class works test.RunClassFldScenario(); @@ -190,17 +187,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(_dataTable.outArrayPtr); } - public void RunClassLclFldScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario)); - - var test = new AesBinaryOpTest__{Method}{RetBaseType}(); - var result = {Isa}.{Method}(test._fld1, test._fld2); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(_dataTable.outArrayPtr); - } - public void RunClassFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassFldScenario)); diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Shared/AesImmOpTest.template b/src/tests/JIT/HardwareIntrinsics/X86/Shared/AesImmOpTest.template index ac304b752012fc..074df686354f64 100644 --- a/src/tests/JIT/HardwareIntrinsics/X86/Shared/AesImmOpTest.template +++ b/src/tests/JIT/HardwareIntrinsics/X86/Shared/AesImmOpTest.template @@ -44,9 +44,6 @@ namespace JIT.HardwareIntrinsics.X86 // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); - // Validates passing the field of a local class works - test.RunClassLclFldScenario(); - // Validates passing an instance member of a class works test.RunClassFldScenario(); @@ -182,17 +179,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(_dataTable.outArrayPtr); } - public void RunClassLclFldScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario)); - - var test = new AesImmOpTest__{Method}{RetBaseType}{Imm}(); - var result = {Isa}.{Method}(test._fld, {Imm}); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(_dataTable.outArrayPtr); - } - public void RunClassFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassFldScenario)); diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Shared/AesUnOpTest.template b/src/tests/JIT/HardwareIntrinsics/X86/Shared/AesUnOpTest.template index 1df632a21c66b4..d82ae0a0b91da7 100644 --- a/src/tests/JIT/HardwareIntrinsics/X86/Shared/AesUnOpTest.template +++ b/src/tests/JIT/HardwareIntrinsics/X86/Shared/AesUnOpTest.template @@ -44,9 +44,6 @@ namespace JIT.HardwareIntrinsics.X86 // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); - // Validates passing the field of a local class works - test.RunClassLclFldScenario(); - // Validates passing an instance member of a class works test.RunClassFldScenario(); @@ -178,17 +175,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(_dataTable.outArrayPtr); } - public void RunClassLclFldScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario)); - - var test = new AesUnaryOpTest__{Method}{RetBaseType}(); - var result = {Isa}.{Method}(test._fld); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(_dataTable.outArrayPtr); - } - public void RunClassFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassFldScenario)); diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Shared/ExtractScalarTest.template b/src/tests/JIT/HardwareIntrinsics/X86/Shared/ExtractScalarTest.template index 67a0761f23cb5a..867b903a02e1ac 100644 --- a/src/tests/JIT/HardwareIntrinsics/X86/Shared/ExtractScalarTest.template +++ b/src/tests/JIT/HardwareIntrinsics/X86/Shared/ExtractScalarTest.template @@ -44,9 +44,6 @@ namespace JIT.HardwareIntrinsics.X86 // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); - // Validates passing the field of a local class works - test.RunClassLclFldScenario(); - // Validates passing an instance member of a class works test.RunClassFldScenario(); @@ -184,17 +181,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(firstOp, _dataTable.outArrayPtr); } - public void RunClassLclFldScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario)); - - var test = new ExtractScalarTest__{Method}{RetBaseType}{Imm}(); - var result = {Isa}.{Method}(test._fld, {Imm}); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(test._fld, _dataTable.outArrayPtr); - } - public void RunClassFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassFldScenario)); diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Shared/ExtractVector128Test.template b/src/tests/JIT/HardwareIntrinsics/X86/Shared/ExtractVector128Test.template index 74cbec105589db..15b020899f7966 100644 --- a/src/tests/JIT/HardwareIntrinsics/X86/Shared/ExtractVector128Test.template +++ b/src/tests/JIT/HardwareIntrinsics/X86/Shared/ExtractVector128Test.template @@ -44,9 +44,6 @@ namespace JIT.HardwareIntrinsics.X86 // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); - // Validates passing the field of a local class works - test.RunClassLclFldScenario(); - // Validates passing an instance member of a class works test.RunClassFldScenario(); @@ -184,17 +181,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(firstOp, _dataTable.outArrayPtr); } - public void RunClassLclFldScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario)); - - var test = new ExtractVector128Test__{Method}{RetBaseType}{Imm}(); - var result = {Isa}.{Method}(test._fld, {Imm}); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(test._fld, _dataTable.outArrayPtr); - } - public void RunClassFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassFldScenario)); diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Shared/GenericUnOpTest.template b/src/tests/JIT/HardwareIntrinsics/X86/Shared/GenericUnOpTest.template index 96bf96df1966e4..2331a4da0c2695 100644 --- a/src/tests/JIT/HardwareIntrinsics/X86/Shared/GenericUnOpTest.template +++ b/src/tests/JIT/HardwareIntrinsics/X86/Shared/GenericUnOpTest.template @@ -44,9 +44,6 @@ namespace JIT.HardwareIntrinsics.X86 // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); - // Validates passing the field of a local class works - test.RunClassLclFldScenario(); - // Validates passing an instance member of a class works test.RunClassFldScenario(); @@ -181,17 +178,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(firstOp, _dataTable.outArrayPtr); } - public void RunClassLclFldScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario)); - - var test = new GenericUnaryOpTest__{Method}{RetBaseType}(); - var result = {Isa}.{Method}<{RetBaseType}>(test._fld); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(test._fld, _dataTable.outArrayPtr); - } - public void RunClassFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassFldScenario)); diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Shared/ImmBinOpTest.template b/src/tests/JIT/HardwareIntrinsics/X86/Shared/ImmBinOpTest.template index eeb659eee6185d..2848cd4da81de3 100644 --- a/src/tests/JIT/HardwareIntrinsics/X86/Shared/ImmBinOpTest.template +++ b/src/tests/JIT/HardwareIntrinsics/X86/Shared/ImmBinOpTest.template @@ -44,9 +44,6 @@ namespace JIT.HardwareIntrinsics.X86 // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); - // Validates passing the field of a local class works - test.RunClassLclFldScenario(); - // Validates passing an instance member of a class works test.RunClassFldScenario(); @@ -198,17 +195,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(left, right, _dataTable.outArrayPtr); } - public void RunClassLclFldScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario)); - - var test = new ImmBinaryOpTest__{Method}{RetBaseType}{Imm}(); - var result = {Isa}.{Method}(test._fld1, test._fld2, {Imm}); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(test._fld1, test._fld2, _dataTable.outArrayPtr); - } - public void RunClassFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassFldScenario)); diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Shared/ImmUnOpTest.template b/src/tests/JIT/HardwareIntrinsics/X86/Shared/ImmUnOpTest.template index e05ff8e05e5c8f..1b403ffcc02566 100644 --- a/src/tests/JIT/HardwareIntrinsics/X86/Shared/ImmUnOpTest.template +++ b/src/tests/JIT/HardwareIntrinsics/X86/Shared/ImmUnOpTest.template @@ -44,9 +44,6 @@ namespace JIT.HardwareIntrinsics.X86 // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); - // Validates passing the field of a local class works - test.RunClassLclFldScenario(); - // Validates passing an instance member of a class works test.RunClassFldScenario(); @@ -184,17 +181,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(firstOp, _dataTable.outArrayPtr); } - public void RunClassLclFldScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario)); - - var test = new ImmUnaryOpTest__{Method}{RetBaseType}{Imm}(); - var result = {Isa}.{Method}(test._fld, {Imm}); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(test._fld, _dataTable.outArrayPtr); - } - public void RunClassFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassFldScenario)); diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Shared/InsertScalarTest.template b/src/tests/JIT/HardwareIntrinsics/X86/Shared/InsertScalarTest.template index c11c233b863fee..514382fa56e484 100644 --- a/src/tests/JIT/HardwareIntrinsics/X86/Shared/InsertScalarTest.template +++ b/src/tests/JIT/HardwareIntrinsics/X86/Shared/InsertScalarTest.template @@ -44,9 +44,6 @@ namespace JIT.HardwareIntrinsics.X86 // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario(); - // Validates passing the field of a local class works - test.RunClassLclFldScenario(); - // Validates passing an instance member of a class works test.RunClassFldScenario(); @@ -201,17 +198,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(firstOp, localData, _dataTable.outArrayPtr); } - public void RunClassLclFldScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario)); - - var test = new InsertScalarTest__{Method}{RetBaseType}{Imm}(); - var result = {Isa}.{Method}(test._fld, test._scalarFldData, {Imm}); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(test._fld, test._scalarFldData, _dataTable.outArrayPtr); - } - public void RunClassFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassFldScenario)); diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Shared/InsertVector128Test.template b/src/tests/JIT/HardwareIntrinsics/X86/Shared/InsertVector128Test.template index d49542698d778d..fba0d7993367fa 100644 --- a/src/tests/JIT/HardwareIntrinsics/X86/Shared/InsertVector128Test.template +++ b/src/tests/JIT/HardwareIntrinsics/X86/Shared/InsertVector128Test.template @@ -46,9 +46,6 @@ namespace JIT.HardwareIntrinsics.X86 // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); - // Validates passing the field of a local class works - test.RunClassLclFldScenario(); - // Validates passing an instance member of a class works test.RunClassFldScenario(); @@ -200,17 +197,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(left, right, _dataTable.outArrayPtr); } - public void RunClassLclFldScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario)); - - var test = new InsertVector128Test__{Method}{RetBaseType}{Imm}(); - var result = {Isa}.{Method}(test._fld1, test._fld2, {Imm}); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(test._fld1, test._fld2, _dataTable.outArrayPtr); - } - public void RunClassFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassFldScenario)); diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Shared/LoadBinOpTest.template b/src/tests/JIT/HardwareIntrinsics/X86/Shared/LoadBinOpTest.template index e4de0393118ca8..7b97794b72aaba 100644 --- a/src/tests/JIT/HardwareIntrinsics/X86/Shared/LoadBinOpTest.template +++ b/src/tests/JIT/HardwareIntrinsics/X86/Shared/LoadBinOpTest.template @@ -45,9 +45,6 @@ namespace JIT.HardwareIntrinsics.X86 // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); - // Validates passing the field of a local class works - test.RunClassLclFldScenario(); - // Validates passing an instance member of a class works test.RunClassFldScenario(); @@ -192,17 +189,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(left, right, _dataTable.outArrayPtr); } - public void RunClassLclFldScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario)); - - var test = new SimpleBinaryOpTest__{Method}{RetBaseType}(); - var result = {Isa}.{Method}(({RetBaseType}*)_dataTable.inArray1Ptr, test._fld2); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(_dataTable.inArray1Ptr, test._fld2, _dataTable.outArrayPtr); - } - public void RunClassFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassFldScenario)); diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Shared/PclmulqdqOpTest.template b/src/tests/JIT/HardwareIntrinsics/X86/Shared/PclmulqdqOpTest.template index b69e50dc99e7bd..487941a088089b 100644 --- a/src/tests/JIT/HardwareIntrinsics/X86/Shared/PclmulqdqOpTest.template +++ b/src/tests/JIT/HardwareIntrinsics/X86/Shared/PclmulqdqOpTest.template @@ -44,9 +44,6 @@ namespace JIT.HardwareIntrinsics.X86 // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); - // Validates passing the field of a local class works - test.RunClassLclFldScenario(); - // Validates passing an instance member of a class works test.RunClassFldScenario(); @@ -192,17 +189,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(_dataTable.outArrayPtr); } - public void RunClassLclFldScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario)); - - var test = new PclmulqdqOpTest__{Method}{RetBaseType}{Imm}(); - var result = {Isa}.{Method}(test._fld1, test._fld2, {Imm}); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(_dataTable.outArrayPtr); - } - public void RunClassFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassFldScenario)); diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Shared/ScalarBinOpTest.template b/src/tests/JIT/HardwareIntrinsics/X86/Shared/ScalarBinOpTest.template index b24b8e119481c2..48d402cda79ffd 100644 --- a/src/tests/JIT/HardwareIntrinsics/X86/Shared/ScalarBinOpTest.template +++ b/src/tests/JIT/HardwareIntrinsics/X86/Shared/ScalarBinOpTest.template @@ -35,9 +35,6 @@ namespace JIT.HardwareIntrinsics.X86 // Validates passing a local works, using Unsafe.ReadUnaligned test.RunLclVarScenario_UnsafeRead(); - // Validates passing the field of a local class works - test.RunClassLclFldScenario(); - // Validates passing an instance member of a class works test.RunClassFldScenario(); @@ -141,16 +138,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(data1, data2, result); } - public void RunClassLclFldScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario)); - - var test = new ScalarBinaryOpTest__{Method}{RetBaseType}(); - var result = {Isa}.{Method}(test._fld1, test._fld2); - - ValidateResult(test._fld1, test._fld2, result); - } - public void RunClassFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassFldScenario)); diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Shared/ScalarSimdUnOpTest.template b/src/tests/JIT/HardwareIntrinsics/X86/Shared/ScalarSimdUnOpTest.template index 49f0885b196d0c..91639731341863 100644 --- a/src/tests/JIT/HardwareIntrinsics/X86/Shared/ScalarSimdUnOpTest.template +++ b/src/tests/JIT/HardwareIntrinsics/X86/Shared/ScalarSimdUnOpTest.template @@ -35,9 +35,6 @@ namespace JIT.HardwareIntrinsics.X86 // Validates passing a local works test.RunLclVarScenario_UnsafeRead(); - // Validates passing the field of a local class works - test.RunClassLclFldScenario(); - // Validates passing an instance member of a class works test.RunClassFldScenario(); @@ -142,17 +139,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(data, _dataTable.outArrayPtr); } - public void RunClassLclFldScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario)); - - var test = new ScalarSimdUnaryOpTest__{Method}{RetBaseType}(); - var result = {Isa}.{Method}(test._fld); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(test._fld, _dataTable.outArrayPtr); - } - public void RunClassFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassFldScenario)); diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Shared/ScalarTernOpBinResTest.template b/src/tests/JIT/HardwareIntrinsics/X86/Shared/ScalarTernOpBinResTest.template index daada6a98ddac2..5ccd3a90e43cff 100644 --- a/src/tests/JIT/HardwareIntrinsics/X86/Shared/ScalarTernOpBinResTest.template +++ b/src/tests/JIT/HardwareIntrinsics/X86/Shared/ScalarTernOpBinResTest.template @@ -36,9 +36,6 @@ namespace JIT.HardwareIntrinsics.X86 // Validates passing a local works, using Unsafe.ReadUnaligned test.RunLclVarScenario_UnsafeRead(); - // Validates passing the field of a local class works - test.RunClassLclFldScenario(); - // Validates passing an instance member of a class works test.RunClassFldScenario(); @@ -156,18 +153,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(data1, data2, data3, result); } - public void RunClassLclFldScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario)); - - {Op3BaseType} buffer = 0; - - var test = new ScalarTernOpBinResTest__{Method}{RetBaseType}(); - var result = {Isa}.{Method}(test._fld1, test._fld2, &buffer); - - ValidateResult(test._fld1, test._fld2, buffer, result); - } - public void RunClassFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassFldScenario)); diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Shared/ScalarTernOpTest.template b/src/tests/JIT/HardwareIntrinsics/X86/Shared/ScalarTernOpTest.template index 0849eed77ec557..52be10611fcb5e 100644 --- a/src/tests/JIT/HardwareIntrinsics/X86/Shared/ScalarTernOpTest.template +++ b/src/tests/JIT/HardwareIntrinsics/X86/Shared/ScalarTernOpTest.template @@ -35,9 +35,6 @@ namespace JIT.HardwareIntrinsics.X86 // Validates passing a local works, using Unsafe.ReadUnaligned test.RunLclVarScenario_UnsafeRead(); - // Validates passing the field of a local class works - test.RunClassLclFldScenario(); - // Validates passing an instance member of a class works test.RunClassFldScenario(); @@ -150,16 +147,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(data1, data2, data3, result); } - public void RunClassLclFldScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario)); - - var test = new ScalarTernOpTest__{Method}{RetBaseType}(); - var result = {Isa}.{Method}(test._fld1, test._fld2, test._fld3); - - ValidateResult(test._fld1, test._fld2, test._fld3, result); - } - public void RunClassFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassFldScenario)); diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Shared/ScalarTernOpTupleBinRetTest.template b/src/tests/JIT/HardwareIntrinsics/X86/Shared/ScalarTernOpTupleBinRetTest.template index 9385ed17e66781..d719247b491658 100644 --- a/src/tests/JIT/HardwareIntrinsics/X86/Shared/ScalarTernOpTupleBinRetTest.template +++ b/src/tests/JIT/HardwareIntrinsics/X86/Shared/ScalarTernOpTupleBinRetTest.template @@ -32,9 +32,6 @@ namespace JIT.HardwareIntrinsics.X86 // Validates passing a local works, using Unsafe.ReadUnaligned test.RunLclVarScenario_UnsafeRead(); - // Validates passing the field of a local class works - test.RunClassLclFldScenario(); - // Validates passing an instance member of a class works test.RunClassFldScenario(); @@ -147,16 +144,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(data1, data2, data3, result); } - public void RunClassLclFldScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario)); - - var test = new ScalarTernOpTupleTest__{Method}{RetBaseType}(); - var result = {Isa}.{Method}(test._fld1, test._fld2, test._fld3); - - ValidateResult(test._fld1, test._fld2, test._fld3, result); - } - public void RunClassFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassFldScenario)); diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Shared/ScalarUnOpTest.template b/src/tests/JIT/HardwareIntrinsics/X86/Shared/ScalarUnOpTest.template index 7d11fd06d9599e..e0de8a8c29f9fe 100644 --- a/src/tests/JIT/HardwareIntrinsics/X86/Shared/ScalarUnOpTest.template +++ b/src/tests/JIT/HardwareIntrinsics/X86/Shared/ScalarUnOpTest.template @@ -35,9 +35,6 @@ namespace JIT.HardwareIntrinsics.X86 // Validates passing a local works, using Unsafe.ReadUnaligned test.RunLclVarScenario_UnsafeRead(); - // Validates passing the field of a local class works - test.RunClassLclFldScenario(); - // Validates passing an instance member of a class works test.RunClassFldScenario(); @@ -131,16 +128,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(data, result); } - public void RunClassLclFldScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario)); - - var test = new ScalarUnaryOpTest__{Method}{RetBaseType}(); - var result = {Isa}.{Method}(test._fld); - - ValidateResult(test._fld, result); - } - public void RunClassFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassFldScenario)); diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Shared/SimdScalarUnOpConvTest.template b/src/tests/JIT/HardwareIntrinsics/X86/Shared/SimdScalarUnOpConvTest.template index b7aa69ed91fcce..a9b011959440a9 100644 --- a/src/tests/JIT/HardwareIntrinsics/X86/Shared/SimdScalarUnOpConvTest.template +++ b/src/tests/JIT/HardwareIntrinsics/X86/Shared/SimdScalarUnOpConvTest.template @@ -45,9 +45,6 @@ namespace JIT.HardwareIntrinsics.X86 // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); - // Validates passing the field of a local class works - test.RunClassLclFldScenario(); - // Validates passing an instance member of a class works test.RunClassFldScenario(); @@ -173,16 +170,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(firstOp, result); } - public void RunClassLclFldScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario)); - - var test = new SimdScalarUnaryOpConvertTest__{Method}{Op1VectorType}{Op1BaseType}(); - var result = {Isa}.{Method}(test._fld); - - ValidateResult(test._fld, result); - } - public void RunClassFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassFldScenario)); diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Shared/SimdScalarUnOpTest.template b/src/tests/JIT/HardwareIntrinsics/X86/Shared/SimdScalarUnOpTest.template index 450dcb0ea452be..b4dfc50f372355 100644 --- a/src/tests/JIT/HardwareIntrinsics/X86/Shared/SimdScalarUnOpTest.template +++ b/src/tests/JIT/HardwareIntrinsics/X86/Shared/SimdScalarUnOpTest.template @@ -45,9 +45,6 @@ namespace JIT.HardwareIntrinsics.X86 // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); - // Validates passing the field of a local class works - test.RunClassLclFldScenario(); - // Validates passing an instance member of a class works test.RunClassFldScenario(); @@ -173,16 +170,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(firstOp, result); } - public void RunClassLclFldScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario)); - - var test = new SimdScalarUnaryOpTest__{Method}{RetBaseType}(); - var result = {Isa}.{Method}(test._fld); - - ValidateResult(test._fld, result); - } - public void RunClassFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassFldScenario)); diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Shared/SimpleBinOpConvTest.template b/src/tests/JIT/HardwareIntrinsics/X86/Shared/SimpleBinOpConvTest.template index 1df5802cf3614f..07c10338ba811c 100644 --- a/src/tests/JIT/HardwareIntrinsics/X86/Shared/SimpleBinOpConvTest.template +++ b/src/tests/JIT/HardwareIntrinsics/X86/Shared/SimpleBinOpConvTest.template @@ -45,9 +45,6 @@ namespace JIT.HardwareIntrinsics.X86 // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); - // Validates passing the field of a local class works - test.RunClassLclFldScenario(); - // Validates passing an instance member of a class works test.RunClassFldScenario(); @@ -191,17 +188,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(left, right, _dataTable.outArrayPtr); } - public void RunClassLclFldScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario)); - - var test = new SimpleBinaryOpConvTest__{Method}{RetBaseType}(); - var result = {Isa}.{Method}(test._fld1, test._fld2); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(test._fld1, test._fld2, _dataTable.outArrayPtr); - } - public void RunClassFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassFldScenario)); diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Shared/SimpleUnOpConvTest.template b/src/tests/JIT/HardwareIntrinsics/X86/Shared/SimpleUnOpConvTest.template index 055c757c25b480..f4be90b4c0b269 100644 --- a/src/tests/JIT/HardwareIntrinsics/X86/Shared/SimpleUnOpConvTest.template +++ b/src/tests/JIT/HardwareIntrinsics/X86/Shared/SimpleUnOpConvTest.template @@ -44,9 +44,6 @@ namespace JIT.HardwareIntrinsics.X86 // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); - // Validates passing the field of a local class works - test.RunClassLclFldScenario(); - // Validates passing an instance member of a class works test.RunClassFldScenario(); @@ -180,17 +177,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(firstOp, _dataTable.outArrayPtr); } - public void RunClassLclFldScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario)); - - var test = new SimpleUnaryOpConvTest__{Method}{Op1VectorType}{Op1BaseType}(); - var result = {Isa}.{Method}(test._fld); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(test._fld, _dataTable.outArrayPtr); - } - public void RunClassFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassFldScenario)); diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Shared/StoreBinOpTest.template b/src/tests/JIT/HardwareIntrinsics/X86/Shared/StoreBinOpTest.template index 89fe271cab2964..81a8f57c67f7b9 100644 --- a/src/tests/JIT/HardwareIntrinsics/X86/Shared/StoreBinOpTest.template +++ b/src/tests/JIT/HardwareIntrinsics/X86/Shared/StoreBinOpTest.template @@ -45,9 +45,6 @@ namespace JIT.HardwareIntrinsics.X86 // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); - // Validates passing the field of a local class works - test.RunClassLclFldScenario(); - // Validates passing an instance member of a class works test.RunClassFldScenario(); @@ -192,16 +189,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(left, right, _dataTable.outArrayPtr); } - public void RunClassLclFldScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario)); - - var test = new StoreBinaryOpTest__{Method}{RetBaseType}(); - {Isa}.{Method}(({RetBaseType}*)_dataTable.outArrayPtr, test._fld1, test._fld2); - - ValidateResult(test._fld1, test._fld2, _dataTable.outArrayPtr); - } - public void RunClassFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassFldScenario)); diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Shared/StoreUnOpTest.template b/src/tests/JIT/HardwareIntrinsics/X86/Shared/StoreUnOpTest.template index 56485461a6007c..264cb8e54dfb99 100644 --- a/src/tests/JIT/HardwareIntrinsics/X86/Shared/StoreUnOpTest.template +++ b/src/tests/JIT/HardwareIntrinsics/X86/Shared/StoreUnOpTest.template @@ -45,9 +45,6 @@ namespace JIT.HardwareIntrinsics.X86 // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); - // Validates passing the field of a local class works - test.RunClassLclFldScenario(); - // Validates passing an instance member of a class works test.RunClassFldScenario(); @@ -178,16 +175,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(value, _dataTable.outArrayPtr); } - public void RunClassLclFldScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario)); - - var test = new StoreUnaryOpTest__{Method}{RetBaseType}(); - {Isa}.{Method}(({RetBaseType}*)_dataTable.outArrayPtr, test._fld1); - - ValidateResult(test._fld1, _dataTable.outArrayPtr); - } - public void RunClassFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassFldScenario)); diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Shared/_BinaryOpTestTemplate.template b/src/tests/JIT/HardwareIntrinsics/X86/Shared/_BinaryOpTestTemplate.template index fbfe8fde09763d..6c50e7bc1e5b54 100644 --- a/src/tests/JIT/HardwareIntrinsics/X86/Shared/_BinaryOpTestTemplate.template +++ b/src/tests/JIT/HardwareIntrinsics/X86/Shared/_BinaryOpTestTemplate.template @@ -44,9 +44,6 @@ namespace JIT.HardwareIntrinsics.X86 // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); - // Validates passing the field of a local class works - test.RunClassLclFldScenario(); - // Validates passing an instance member of a class works test.RunClassFldScenario(); @@ -247,17 +244,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(op1, op2, _dataTable.outArrayPtr); } - public void RunClassLclFldScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario)); - - var test = new {TemplateName}BinaryOpTest__{Method}{RetBaseType}(); - var result = {Isa}.{Method}(test._fld1, test._fld2); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(test._fld1, test._fld2, _dataTable.outArrayPtr); - } - public void RunClassFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassFldScenario)); diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Shared/_BooleanBinaryOpTestTemplate.template b/src/tests/JIT/HardwareIntrinsics/X86/Shared/_BooleanBinaryOpTestTemplate.template index a5bde9c5e8ddb7..ef9e29773dfa55 100644 --- a/src/tests/JIT/HardwareIntrinsics/X86/Shared/_BooleanBinaryOpTestTemplate.template +++ b/src/tests/JIT/HardwareIntrinsics/X86/Shared/_BooleanBinaryOpTestTemplate.template @@ -44,9 +44,6 @@ namespace JIT.HardwareIntrinsics.X86 // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); - // Validates passing the field of a local class works - test.RunClassLclFldScenario(); - // Validates passing an instance member of a class works test.RunClassFldScenario(); @@ -232,16 +229,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(op1, op2, result); } - public void RunClassLclFldScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario)); - - var test = new {TemplateName}BinaryOpTest__{Method}{RetBaseType}(); - var result = {Isa}.{Method}(test._fld1, test._fld2); - - ValidateResult(test._fld1, test._fld2, result); - } - public void RunClassFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassFldScenario)); diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Shared/_BooleanUnaryOpTestTemplate.template b/src/tests/JIT/HardwareIntrinsics/X86/Shared/_BooleanUnaryOpTestTemplate.template index 244c4e2b853e9c..bdc5ee2944f2bd 100644 --- a/src/tests/JIT/HardwareIntrinsics/X86/Shared/_BooleanUnaryOpTestTemplate.template +++ b/src/tests/JIT/HardwareIntrinsics/X86/Shared/_BooleanUnaryOpTestTemplate.template @@ -44,9 +44,6 @@ namespace JIT.HardwareIntrinsics.X86 // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); - // Validates passing the field of a local class works - test.RunClassLclFldScenario(); - // Validates passing an instance member of a class works test.RunClassFldScenario(); @@ -210,16 +207,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(op1, result); } - public void RunClassLclFldScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario)); - - var test = new {TemplateName}UnaryOpTest__{Method}{RetBaseType}(); - var result = {Isa}.{Method}(test._fld1); - - ValidateResult(test._fld1, result); - } - public void RunClassFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassFldScenario)); diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Shared/_TernaryOpTestTemplate.template b/src/tests/JIT/HardwareIntrinsics/X86/Shared/_TernaryOpTestTemplate.template index 73f964e491a0e9..eb6fc49d009b33 100644 --- a/src/tests/JIT/HardwareIntrinsics/X86/Shared/_TernaryOpTestTemplate.template +++ b/src/tests/JIT/HardwareIntrinsics/X86/Shared/_TernaryOpTestTemplate.template @@ -44,9 +44,6 @@ namespace JIT.HardwareIntrinsics.X86 // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); - // Validates passing the field of a local class works - test.RunClassLclFldScenario(); - // Validates passing an instance member of a class works test.RunClassFldScenario(); @@ -269,17 +266,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(op1, op2, op3, _dataTable.outArrayPtr); } - public void RunClassLclFldScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario)); - - var test = new {TemplateName}TernaryOpTest__{Method}{RetBaseType}(); - var result = {Isa}.{Method}(test._fld1, test._fld2, test._fld3); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(test._fld1, test._fld2, test._fld3, _dataTable.outArrayPtr); - } - public void RunClassFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassFldScenario)); diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Shared/_UnaryOpTestTemplate.template b/src/tests/JIT/HardwareIntrinsics/X86/Shared/_UnaryOpTestTemplate.template index 2de7f67baeda2e..e5f9148acd9368 100644 --- a/src/tests/JIT/HardwareIntrinsics/X86/Shared/_UnaryOpTestTemplate.template +++ b/src/tests/JIT/HardwareIntrinsics/X86/Shared/_UnaryOpTestTemplate.template @@ -44,9 +44,6 @@ namespace JIT.HardwareIntrinsics.X86 // Validates passing a local works, using Unsafe.Read test.RunLclVarScenario_UnsafeRead(); - // Validates passing the field of a local class works - test.RunClassLclFldScenario(); - // Validates passing an instance member of a class works test.RunClassFldScenario(); @@ -225,17 +222,6 @@ namespace JIT.HardwareIntrinsics.X86 ValidateResult(op1, _dataTable.outArrayPtr); } - public void RunClassLclFldScenario() - { - TestLibrary.TestFramework.BeginScenario(nameof(RunClassLclFldScenario)); - - var test = new {TemplateName}UnaryOpTest__{Method}{RetBaseType}(); - var result = {Isa}.{Method}(test._fld1); - - Unsafe.Write(_dataTable.outArrayPtr, result); - ValidateResult(test._fld1, _dataTable.outArrayPtr); - } - public void RunClassFldScenario() { TestLibrary.TestFramework.BeginScenario(nameof(RunClassFldScenario)); From b6dac50f6f3782fc3ce74c30c65cd4decef24b52 Mon Sep 17 00:00:00 2001 From: Tanner Gooding Date: Tue, 18 Apr 2023 18:34:48 -0700 Subject: [PATCH 04/10] Divide the original striping between the split hwintrinsic test projects --- .../JIT/HardwareIntrinsics/HardwareIntrinsics_Arm_r.csproj | 2 +- .../JIT/HardwareIntrinsics/HardwareIntrinsics_Arm_ro.csproj | 2 +- .../JIT/HardwareIntrinsics/HardwareIntrinsics_General_r.csproj | 2 +- .../JIT/HardwareIntrinsics/HardwareIntrinsics_General_ro.csproj | 2 +- .../HardwareIntrinsics/HardwareIntrinsics_X86_Avx512_r.csproj | 2 +- .../HardwareIntrinsics/HardwareIntrinsics_X86_Avx512_ro.csproj | 2 +- .../JIT/HardwareIntrinsics/HardwareIntrinsics_X86_Avx_r.csproj | 2 +- .../JIT/HardwareIntrinsics/HardwareIntrinsics_X86_Avx_ro.csproj | 2 +- .../JIT/HardwareIntrinsics/HardwareIntrinsics_X86_r.csproj | 2 +- .../JIT/HardwareIntrinsics/HardwareIntrinsics_X86_ro.csproj | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_Arm_r.csproj b/src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_Arm_r.csproj index a9308667c02535..05eba017a9df15 100644 --- a/src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_Arm_r.csproj +++ b/src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_Arm_r.csproj @@ -1,6 +1,6 @@ - 16 + 8 true true diff --git a/src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_Arm_ro.csproj b/src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_Arm_ro.csproj index 6154ed27bc5428..356f5e1fa6ad23 100644 --- a/src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_Arm_ro.csproj +++ b/src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_Arm_ro.csproj @@ -1,6 +1,6 @@ - 16 + 8 true true diff --git a/src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_General_r.csproj b/src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_General_r.csproj index a0b263b6da9398..fa59559ab5689c 100644 --- a/src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_General_r.csproj +++ b/src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_General_r.csproj @@ -1,6 +1,6 @@ - 16 + 8 true true diff --git a/src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_General_ro.csproj b/src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_General_ro.csproj index e043d3a01b7f72..4adf6dbb03e485 100644 --- a/src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_General_ro.csproj +++ b/src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_General_ro.csproj @@ -1,6 +1,6 @@ - 16 + 8 true true diff --git a/src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_X86_Avx512_r.csproj b/src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_X86_Avx512_r.csproj index bde7f164f6ba7e..b361005cc4eae6 100644 --- a/src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_X86_Avx512_r.csproj +++ b/src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_X86_Avx512_r.csproj @@ -1,6 +1,6 @@ - 16 + 2 true true diff --git a/src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_X86_Avx512_ro.csproj b/src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_X86_Avx512_ro.csproj index d8284ca9f59313..d3af89bf7e599f 100644 --- a/src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_X86_Avx512_ro.csproj +++ b/src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_X86_Avx512_ro.csproj @@ -1,6 +1,6 @@ - 16 + 2 true true diff --git a/src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_X86_Avx_r.csproj b/src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_X86_Avx_r.csproj index 3e35137c7ecd6e..97841e89da035d 100644 --- a/src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_X86_Avx_r.csproj +++ b/src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_X86_Avx_r.csproj @@ -1,6 +1,6 @@ - 16 + 2 true true diff --git a/src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_X86_Avx_ro.csproj b/src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_X86_Avx_ro.csproj index 07d0054bd46baf..768062f68afb39 100644 --- a/src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_X86_Avx_ro.csproj +++ b/src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_X86_Avx_ro.csproj @@ -1,6 +1,6 @@ - 16 + 2 true true diff --git a/src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_X86_r.csproj b/src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_X86_r.csproj index 18aea40efa1aea..76ad46ac48f309 100644 --- a/src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_X86_r.csproj +++ b/src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_X86_r.csproj @@ -1,6 +1,6 @@ - 16 + 2 true true diff --git a/src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_X86_ro.csproj b/src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_X86_ro.csproj index a0860f4aecceb1..b34844d05ae56a 100644 --- a/src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_X86_ro.csproj +++ b/src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_X86_ro.csproj @@ -1,6 +1,6 @@ - 16 + 2 true true From 3f48142a445a371e72d28b57f8f1d502d489e050 Mon Sep 17 00:00:00 2001 From: Tanner Gooding Date: Tue, 18 Apr 2023 18:42:45 -0700 Subject: [PATCH 05/10] Minor formatting change to trigger JIT tests --- src/coreclr/jit/emitxarch.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/coreclr/jit/emitxarch.cpp b/src/coreclr/jit/emitxarch.cpp index d76be519adc951..4e25a445bbaa80 100644 --- a/src/coreclr/jit/emitxarch.cpp +++ b/src/coreclr/jit/emitxarch.cpp @@ -35,7 +35,7 @@ bool emitter::IsSSEOrAVXInstruction(instruction ins) } //------------------------------------------------------------------------ -// IsKInstruction: Does this instruction require K register. +// IsKInstruction: Does this instruction require K register? // // Arguments: // ins - The instruction to check. From ba6266564f13a49f205c66654dd16eff53d37185 Mon Sep 17 00:00:00 2001 From: Tanner Gooding Date: Wed, 19 Apr 2023 04:41:32 -0700 Subject: [PATCH 06/10] Allow Avx512 tests to run in Pri0 --- .../HardwareIntrinsics/HardwareIntrinsics_X86_Avx512_r.csproj | 3 --- .../HardwareIntrinsics/HardwareIntrinsics_X86_Avx512_ro.csproj | 3 --- 2 files changed, 6 deletions(-) diff --git a/src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_X86_Avx512_r.csproj b/src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_X86_Avx512_r.csproj index b361005cc4eae6..4fae2968d100a1 100644 --- a/src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_X86_Avx512_r.csproj +++ b/src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_X86_Avx512_r.csproj @@ -10,9 +10,6 @@ true true true - - - 1 diff --git a/src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_X86_Avx512_ro.csproj b/src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_X86_Avx512_ro.csproj index d3af89bf7e599f..441189e79510dd 100644 --- a/src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_X86_Avx512_ro.csproj +++ b/src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_X86_Avx512_ro.csproj @@ -10,9 +10,6 @@ true true true - - - 1 From 7fdc37d95cd147d12dfbfebb9d1ce5450ada71f4 Mon Sep 17 00:00:00 2001 From: Tanner Gooding Date: Wed, 19 Apr 2023 05:55:44 -0700 Subject: [PATCH 07/10] Ensure that crossgen correctly handles the VL nested class --- src/coreclr/tools/Common/Compiler/InstructionSetSupport.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/coreclr/tools/Common/Compiler/InstructionSetSupport.cs b/src/coreclr/tools/Common/Compiler/InstructionSetSupport.cs index affc29d19310c0..6d124bda4673c6 100644 --- a/src/coreclr/tools/Common/Compiler/InstructionSetSupport.cs +++ b/src/coreclr/tools/Common/Compiler/InstructionSetSupport.cs @@ -58,6 +58,8 @@ public static string GetHardwareIntrinsicId(TargetArchitecture architecture, Typ { if (potentialType.Name == "X64") potentialType = (MetadataType)potentialType.ContainingType; + if (potentialType.Name == "VL") + potentialType = (MetadataType)potentialType.ContainingType; if (potentialType.Namespace != "System.Runtime.Intrinsics.X86") return ""; } @@ -65,6 +67,8 @@ public static string GetHardwareIntrinsicId(TargetArchitecture architecture, Typ { if (potentialType.Name == "X64") potentialType = (MetadataType)potentialType.ContainingType; + if (potentialType.Name == "VL") + potentialType = (MetadataType)potentialType.ContainingType; if (potentialType.Namespace != "System.Runtime.Intrinsics.X86") return ""; } From 2b2bc7b78d3436c1566232774c11d5f1d40c6043 Mon Sep 17 00:00:00 2001 From: Tanner Gooding Date: Wed, 19 Apr 2023 06:14:34 -0700 Subject: [PATCH 08/10] Fixing an issue with NI_AVX512F_ConvertToVector256Int32 for TYP_DOUBLE --- src/coreclr/jit/hwintrinsiccodegenxarch.cpp | 27 ++++++++++++--------- src/coreclr/jit/lowerxarch.cpp | 22 +++++++++++++++-- 2 files changed, 35 insertions(+), 14 deletions(-) diff --git a/src/coreclr/jit/hwintrinsiccodegenxarch.cpp b/src/coreclr/jit/hwintrinsiccodegenxarch.cpp index ae0879e4ba4730..772b8439ba65d5 100644 --- a/src/coreclr/jit/hwintrinsiccodegenxarch.cpp +++ b/src/coreclr/jit/hwintrinsiccodegenxarch.cpp @@ -1786,12 +1786,22 @@ void CodeGen::genAvxFamilyIntrinsic(GenTreeHWIntrinsic* node) break; } + case NI_AVX512F_ConvertToVector256Int32: + { + if (varTypeIsFloating(baseType)) + { + instruction ins = HWIntrinsicInfo::lookupIns(intrinsicId, baseType); + genHWIntrinsic_R_RM(node, ins, attr, targetReg, op1); + break; + } + FALLTHROUGH; + } + case NI_AVX512F_ConvertToVector128Int16: case NI_AVX512F_ConvertToVector128Int32: case NI_AVX512F_ConvertToVector128UInt16: case NI_AVX512F_ConvertToVector128UInt32: case NI_AVX512F_ConvertToVector256Int16: - case NI_AVX512F_ConvertToVector256Int32: case NI_AVX512F_ConvertToVector256UInt16: case NI_AVX512F_ConvertToVector256UInt32: case NI_AVX512BW_ConvertToVector128Byte: @@ -1801,18 +1811,11 @@ void CodeGen::genAvxFamilyIntrinsic(GenTreeHWIntrinsic* node) { instruction ins = HWIntrinsicInfo::lookupIns(intrinsicId, baseType); - if (varTypeIsFloating(baseType)) - { - genHWIntrinsic_R_RM(node, ins, attr, targetReg, op1); - } - else - { - // These instructions are RM_R and so we need to ensure the targetReg - // is passed in as the RM register and op1 is passed as the R register + // These instructions are RM_R and so we need to ensure the targetReg + // is passed in as the RM register and op1 is passed as the R register - op1Reg = op1->GetRegNum(); - emit->emitIns_R_R(ins, attr, op1Reg, targetReg); - } + op1Reg = op1->GetRegNum(); + emit->emitIns_R_R(ins, attr, op1Reg, targetReg); break; } diff --git a/src/coreclr/jit/lowerxarch.cpp b/src/coreclr/jit/lowerxarch.cpp index a5302889d7e3ad..7042f81002765e 100644 --- a/src/coreclr/jit/lowerxarch.cpp +++ b/src/coreclr/jit/lowerxarch.cpp @@ -5759,12 +5759,20 @@ void Lowering::ContainCheckStoreIndir(GenTreeStoreInd* node) break; } + case NI_AVX512F_ConvertToVector256Int32: + { + if (varTypeIsFloating(simdBaseType)) + { + break; + } + FALLTHROUGH; + } + case NI_AVX512F_ConvertToVector128Int16: case NI_AVX512F_ConvertToVector128Int32: case NI_AVX512F_ConvertToVector128UInt16: case NI_AVX512F_ConvertToVector128UInt32: case NI_AVX512F_ConvertToVector256Int16: - case NI_AVX512F_ConvertToVector256Int32: case NI_AVX512F_ConvertToVector256UInt16: case NI_AVX512F_ConvertToVector256UInt32: case NI_AVX512BW_ConvertToVector128Byte: @@ -7402,12 +7410,22 @@ void Lowering::ContainCheckHWIntrinsic(GenTreeHWIntrinsic* node) break; } + case NI_AVX512F_ConvertToVector256Int32: + { + if (varTypeIsFloating(simdBaseType)) + { + // This version is "ins xmm, xmm/mem" and + // gets the default containment handling + break; + } + FALLTHROUGH; + } + case NI_AVX512F_ConvertToVector128Int16: case NI_AVX512F_ConvertToVector128Int32: case NI_AVX512F_ConvertToVector128UInt16: case NI_AVX512F_ConvertToVector128UInt32: case NI_AVX512F_ConvertToVector256Int16: - case NI_AVX512F_ConvertToVector256Int32: case NI_AVX512F_ConvertToVector256UInt16: case NI_AVX512F_ConvertToVector256UInt32: case NI_AVX512BW_ConvertToVector128Byte: From 56f93c49b84bdb7bf8152c500461f5320d6ef725 Mon Sep 17 00:00:00 2001 From: Tanner Gooding Date: Wed, 19 Apr 2023 07:16:16 -0700 Subject: [PATCH 09/10] Fixing a couple small test failures that were masked --- .../GenerateHWIntrinsicTests_X86.cs | 8 ++++---- .../X86_Avx512/Avx512F/ConvertToVector512Int32.Int16.cs | 6 +++--- .../X86_Avx512/Avx512F/ConvertToVector512Int32.UInt16.cs | 6 +++--- .../X86_Avx512/Avx512F/ConvertToVector512Int64.Int32.cs | 6 +++--- .../X86_Avx512/Avx512F/ConvertToVector512Int64.UInt32.cs | 6 +++--- .../X86_Avx512/Avx512F/ConvertToVector512UInt32.Int16.cs | 6 +++--- .../X86_Avx512/Avx512F/ConvertToVector512UInt32.UInt16.cs | 6 +++--- .../X86_Avx512/Avx512F/ConvertToVector512UInt64.Int32.cs | 6 +++--- .../X86_Avx512/Avx512F/ConvertToVector512UInt64.UInt32.cs | 6 +++--- .../HardwareIntrinsics/X86_Avx512/Avx512F/UnpackLow.cs | 8 ++++---- 10 files changed, 32 insertions(+), 32 deletions(-) diff --git a/src/tests/Common/GenerateHWIntrinsicTests/GenerateHWIntrinsicTests_X86.cs b/src/tests/Common/GenerateHWIntrinsicTests/GenerateHWIntrinsicTests_X86.cs index 1b8c3cec126d30..299c4bdd4602c5 100644 --- a/src/tests/Common/GenerateHWIntrinsicTests/GenerateHWIntrinsicTests_X86.cs +++ b/src/tests/Common/GenerateHWIntrinsicTests/GenerateHWIntrinsicTests_X86.cs @@ -1179,10 +1179,10 @@ ("ImmUnOpTest.template", new Dictionary { ["Isa"] = "Avx512F", ["LoadIsa"] = "Avx512F", ["Method"] = "ShiftRightLogical", ["RetVectorType"] = "Vector512", ["RetBaseType"] = "UInt32", ["Op1VectorType"] = "Vector512", ["Op1BaseType"] = "UInt32", ["Imm"] = "32", ["LargestVectorSize"] = "64", ["NextValueOp1"] = "TestLibrary.Generator.GetUInt32()", ["ValidateFirstResult"] = "0 != result[0]", ["ValidateRemainingResults"] = "0!= result[i]"}), ("ImmUnOpTest.template", new Dictionary { ["Isa"] = "Avx512F", ["LoadIsa"] = "Avx512F", ["Method"] = "ShiftRightLogical", ["RetVectorType"] = "Vector512", ["RetBaseType"] = "UInt64", ["Op1VectorType"] = "Vector512", ["Op1BaseType"] = "UInt64", ["Imm"] = "1", ["LargestVectorSize"] = "64", ["NextValueOp1"] = "TestLibrary.Generator.GetUInt64()", ["ValidateFirstResult"] = "(ulong)(firstOp[0] >> 1) != result[0]", ["ValidateRemainingResults"] = "(ulong)(firstOp[i] >> 1) != result[i]"}), ("ImmUnOpTest.template", new Dictionary { ["Isa"] = "Avx512F", ["LoadIsa"] = "Avx512F", ["Method"] = "ShiftRightLogical", ["RetVectorType"] = "Vector512", ["RetBaseType"] = "UInt64", ["Op1VectorType"] = "Vector512", ["Op1BaseType"] = "UInt64", ["Imm"] = "64", ["LargestVectorSize"] = "64", ["NextValueOp1"] = "TestLibrary.Generator.GetUInt64()", ["ValidateFirstResult"] = "0 != result[0]", ["ValidateRemainingResults"] = "0 != result[i]"}), - ("ImmBinOpTest.template", new Dictionary { ["Isa"] = "Avx512F", ["LoadIsa"] = "Avx512F", ["Method"] = "Shuffle", ["RetVectorType"] = "Vector512", ["RetBaseType"] = "Single", ["Op1VectorType"] = "Vector512", ["Op1BaseType"] = "Single", ["Op2VectorType"] = "Vector512", ["Op2BaseType"] = "Single", ["Imm"] = "1", ["LargestVectorSize"] = "64", ["NextValueOp1"] = "TestLibrary.Generator.GetSingle()", ["NextValueOp2"] = "TestLibrary.Generator.GetSingle()", ["ValidateFirstResult"] = "BitConverter.SingleToInt32Bits(result[0]) != BitConverter.SingleToInt32Bits(left[1])", ["ValidateRemainingResults"] = "BitConverter.SingleToInt32Bits(result[7]) != BitConverter.SingleToInt32Bits(right[4])"}), - ("ImmBinOpTest.template", new Dictionary { ["Isa"] = "Avx512F", ["LoadIsa"] = "Avx512F", ["Method"] = "Shuffle", ["RetVectorType"] = "Vector512", ["RetBaseType"] = "Double", ["Op1VectorType"] = "Vector512", ["Op1BaseType"] = "Double", ["Op2VectorType"] = "Vector512", ["Op2BaseType"] = "Double", ["Imm"] = "1", ["LargestVectorSize"] = "64", ["NextValueOp1"] = "TestLibrary.Generator.GetDouble()", ["NextValueOp2"] = "TestLibrary.Generator.GetDouble()", ["ValidateFirstResult"] = "BitConverter.DoubleToInt64Bits(result[0]) != BitConverter.DoubleToInt64Bits(left[1])", ["ValidateRemainingResults"] = "BitConverter.DoubleToInt64Bits(result[3]) != BitConverter.DoubleToInt64Bits(right[2])"}), - ("ImmUnOpTest.template", new Dictionary { ["Isa"] = "Avx512F", ["LoadIsa"] = "Avx512F", ["Method"] = "Shuffle", ["RetVectorType"] = "Vector512", ["RetBaseType"] = "Int32", ["Op1VectorType"] = "Vector512", ["Op1BaseType"] = "Int32", ["Imm"] = "1", ["LargestVectorSize"] = "64", ["NextValueOp1"] = "TestLibrary.Generator.GetInt32()", ["ValidateFirstResult"] = "result[0] != firstOp[1]", ["ValidateRemainingResults"] = "result[i] != (i < 4 ? firstOp[0] : (i == 4 ? firstOp[5] : firstOp[4]))"}), - ("ImmUnOpTest.template", new Dictionary { ["Isa"] = "Avx512F", ["LoadIsa"] = "Avx512F", ["Method"] = "Shuffle", ["RetVectorType"] = "Vector512", ["RetBaseType"] = "UInt32", ["Op1VectorType"] = "Vector512", ["Op1BaseType"] = "UInt32", ["Imm"] = "1", ["LargestVectorSize"] = "64", ["NextValueOp1"] = "TestLibrary.Generator.GetUInt32()", ["ValidateFirstResult"] = "result[0] != firstOp[1]", ["ValidateRemainingResults"] = "result[i] != (i < 4 ? firstOp[0] : (i == 4 ? firstOp[5] : firstOp[4]))"}), + ("ImmBinOpTest.template", new Dictionary { ["Isa"] = "Avx512F", ["LoadIsa"] = "Avx512F", ["Method"] = "Shuffle", ["RetVectorType"] = "Vector512", ["RetBaseType"] = "Single", ["Op1VectorType"] = "Vector512", ["Op1BaseType"] = "Single", ["Op2VectorType"] = "Vector512", ["Op2BaseType"] = "Single", ["Imm"] = "17", ["LargestVectorSize"] = "64", ["NextValueOp1"] = "TestLibrary.Generator.GetSingle()", ["NextValueOp2"] = "TestLibrary.Generator.GetSingle()", ["ValidateFirstResult"] = "BitConverter.SingleToInt32Bits(result[0]) != BitConverter.SingleToInt32Bits(left[1])", ["ValidateRemainingResults"] = "BitConverter.SingleToInt32Bits(result[7]) != BitConverter.SingleToInt32Bits(right[4])"}), + ("ImmBinOpTest.template", new Dictionary { ["Isa"] = "Avx512F", ["LoadIsa"] = "Avx512F", ["Method"] = "Shuffle", ["RetVectorType"] = "Vector512", ["RetBaseType"] = "Double", ["Op1VectorType"] = "Vector512", ["Op1BaseType"] = "Double", ["Op2VectorType"] = "Vector512", ["Op2BaseType"] = "Double", ["Imm"] = "85", ["LargestVectorSize"] = "64", ["NextValueOp1"] = "TestLibrary.Generator.GetDouble()", ["NextValueOp2"] = "TestLibrary.Generator.GetDouble()", ["ValidateFirstResult"] = "BitConverter.DoubleToInt64Bits(result[0]) != BitConverter.DoubleToInt64Bits(left[1])", ["ValidateRemainingResults"] = "BitConverter.DoubleToInt64Bits(result[3]) != BitConverter.DoubleToInt64Bits(right[2])"}), + ("ImmUnOpTest.template", new Dictionary { ["Isa"] = "Avx512F", ["LoadIsa"] = "Avx512F", ["Method"] = "Shuffle", ["RetVectorType"] = "Vector512", ["RetBaseType"] = "Int32", ["Op1VectorType"] = "Vector512", ["Op1BaseType"] = "Int32", ["Imm"] = "1", ["LargestVectorSize"] = "64", ["NextValueOp1"] = "TestLibrary.Generator.GetInt32()", ["ValidateFirstResult"] = "result[0] != firstOp[1]", ["ValidateRemainingResults"] = "result[i] != firstOp[((i / 4) * 4) + ((i % 4) != 0 ? 0 : 1)]"}), + ("ImmUnOpTest.template", new Dictionary { ["Isa"] = "Avx512F", ["LoadIsa"] = "Avx512F", ["Method"] = "Shuffle", ["RetVectorType"] = "Vector512", ["RetBaseType"] = "UInt32", ["Op1VectorType"] = "Vector512", ["Op1BaseType"] = "UInt32", ["Imm"] = "1", ["LargestVectorSize"] = "64", ["NextValueOp1"] = "TestLibrary.Generator.GetUInt32()", ["ValidateFirstResult"] = "result[0] != firstOp[1]", ["ValidateRemainingResults"] = "result[i] != firstOp[((i / 4) * 4) + ((i % 4) != 0 ? 0 : 1)]"}), ("SimpleBinOpTest.template", new Dictionary { ["Isa"] = "Avx512F", ["LoadIsa"] = "Avx512F", ["Method"] = "Subtract", ["RetVectorType"] = "Vector512", ["RetBaseType"] = "Double", ["Op1VectorType"] = "Vector512", ["Op1BaseType"] = "Double", ["Op2VectorType"] = "Vector512", ["Op2BaseType"] = "Double", ["LargestVectorSize"] = "64", ["NextValueOp1"] = "TestLibrary.Generator.GetDouble()", ["NextValueOp2"] = "TestLibrary.Generator.GetDouble()", ["ValidateFirstResult"] = "BitConverter.DoubleToInt64Bits(left[0] - right[0]) != BitConverter.DoubleToInt64Bits(result[0])", ["ValidateRemainingResults"] = "BitConverter.DoubleToInt64Bits(left[i] - right[i]) != BitConverter.DoubleToInt64Bits(result[i])"}), ("SimpleBinOpTest.template", new Dictionary { ["Isa"] = "Avx512F", ["LoadIsa"] = "Avx512F", ["Method"] = "Subtract", ["RetVectorType"] = "Vector512", ["RetBaseType"] = "Int32", ["Op1VectorType"] = "Vector512", ["Op1BaseType"] = "Int32", ["Op2VectorType"] = "Vector512", ["Op2BaseType"] = "Int32", ["LargestVectorSize"] = "64", ["NextValueOp1"] = "TestLibrary.Generator.GetInt32()", ["NextValueOp2"] = "TestLibrary.Generator.GetInt32()", ["ValidateFirstResult"] = "(int)(left[0] - right[0]) != result[0]", ["ValidateRemainingResults"] = "(int)(left[i] - right[i]) != result[i]"}), ("SimpleBinOpTest.template", new Dictionary { ["Isa"] = "Avx512F", ["LoadIsa"] = "Avx512F", ["Method"] = "Subtract", ["RetVectorType"] = "Vector512", ["RetBaseType"] = "Int64", ["Op1VectorType"] = "Vector512", ["Op1BaseType"] = "Int64", ["Op2VectorType"] = "Vector512", ["Op2BaseType"] = "Int64", ["LargestVectorSize"] = "64", ["NextValueOp1"] = "TestLibrary.Generator.GetInt64()", ["NextValueOp2"] = "TestLibrary.Generator.GetInt64()", ["ValidateFirstResult"] = "(long)(left[0] - right[0]) != result[0]", ["ValidateRemainingResults"] = "(long)(left[i] - right[i]) != result[i]"}), diff --git a/src/tests/JIT/HardwareIntrinsics/X86_Avx512/Avx512F/ConvertToVector512Int32.Int16.cs b/src/tests/JIT/HardwareIntrinsics/X86_Avx512/Avx512F/ConvertToVector512Int32.Int16.cs index 28f4ffa1f59475..ec887e9526622d 100644 --- a/src/tests/JIT/HardwareIntrinsics/X86_Avx512/Avx512F/ConvertToVector512Int32.Int16.cs +++ b/src/tests/JIT/HardwareIntrinsics/X86_Avx512/Avx512F/ConvertToVector512Int32.Int16.cs @@ -105,7 +105,7 @@ static SimpleUnaryOpTest__ConvertToVector512Int32Int16() var random = new Random(); for (var i = 0; i < Op1ElementCount; i++) { _data[i] = (short)(random.Next(short.MinValue, short.MaxValue)); } - Unsafe.CopyBlockUnaligned(ref Unsafe.As, byte>(ref _clsVar), ref Unsafe.As(ref _data[0]), 16); + Unsafe.CopyBlockUnaligned(ref Unsafe.As, byte>(ref _clsVar), ref Unsafe.As(ref _data[0]), 32); } public SimpleUnaryOpTest__ConvertToVector512Int32Int16() @@ -115,7 +115,7 @@ public SimpleUnaryOpTest__ConvertToVector512Int32Int16() var random = new Random(); for (var i = 0; i < Op1ElementCount; i++) { _data[i] = (short)(random.Next(short.MinValue, short.MaxValue)); } - Unsafe.CopyBlockUnaligned(ref Unsafe.As, byte>(ref _fld), ref Unsafe.As(ref _data[0]), 16); + Unsafe.CopyBlockUnaligned(ref Unsafe.As, byte>(ref _fld), ref Unsafe.As(ref _data[0]), 32); for (var i = 0; i < Op1ElementCount; i++) { _data[i] = (short)(random.Next(short.MinValue, short.MaxValue)); } _dataTable = new SimpleUnaryOpTest__DataTable(_data, new Int32[RetElementCount], VectorSize); @@ -272,7 +272,7 @@ private void ValidateResult(void* firstOp, void* result, [CallerMemberName] stri Int16[] inArray = new Int16[Op1ElementCount]; Int32[] outArray = new Int32[RetElementCount]; - Unsafe.CopyBlockUnaligned(ref Unsafe.As(ref inArray[0]), ref Unsafe.AsRef(firstOp), 16); + Unsafe.CopyBlockUnaligned(ref Unsafe.As(ref inArray[0]), ref Unsafe.AsRef(firstOp), 32); Unsafe.CopyBlockUnaligned(ref Unsafe.As(ref outArray[0]), ref Unsafe.AsRef(result), VectorSize); ValidateResult(inArray, outArray, method); diff --git a/src/tests/JIT/HardwareIntrinsics/X86_Avx512/Avx512F/ConvertToVector512Int32.UInt16.cs b/src/tests/JIT/HardwareIntrinsics/X86_Avx512/Avx512F/ConvertToVector512Int32.UInt16.cs index e935b8a837a512..b3ab95f6f1dee3 100644 --- a/src/tests/JIT/HardwareIntrinsics/X86_Avx512/Avx512F/ConvertToVector512Int32.UInt16.cs +++ b/src/tests/JIT/HardwareIntrinsics/X86_Avx512/Avx512F/ConvertToVector512Int32.UInt16.cs @@ -105,7 +105,7 @@ static SimpleUnaryOpTest__ConvertToVector512Int32UInt16() var random = new Random(); for (var i = 0; i < Op1ElementCount; i++) { _data[i] = (ushort)(random.Next(0, ushort.MaxValue)); } - Unsafe.CopyBlockUnaligned(ref Unsafe.As, byte>(ref _clsVar), ref Unsafe.As(ref _data[0]), 16); + Unsafe.CopyBlockUnaligned(ref Unsafe.As, byte>(ref _clsVar), ref Unsafe.As(ref _data[0]), 32); } public SimpleUnaryOpTest__ConvertToVector512Int32UInt16() @@ -115,7 +115,7 @@ public SimpleUnaryOpTest__ConvertToVector512Int32UInt16() var random = new Random(); for (var i = 0; i < Op1ElementCount; i++) { _data[i] = (ushort)(random.Next(0, ushort.MaxValue)); } - Unsafe.CopyBlockUnaligned(ref Unsafe.As, byte>(ref _fld), ref Unsafe.As(ref _data[0]), 16); + Unsafe.CopyBlockUnaligned(ref Unsafe.As, byte>(ref _fld), ref Unsafe.As(ref _data[0]), 32); for (var i = 0; i < Op1ElementCount; i++) { _data[i] = (ushort)(random.Next(0, ushort.MaxValue)); } _dataTable = new SimpleUnaryOpTest__DataTable(_data, new UInt32[RetElementCount], VectorSize); @@ -272,7 +272,7 @@ private void ValidateResult(void* firstOp, void* result, [CallerMemberName] stri UInt16[] inArray = new UInt16[Op1ElementCount]; UInt32[] outArray = new UInt32[RetElementCount]; - Unsafe.CopyBlockUnaligned(ref Unsafe.As(ref inArray[0]), ref Unsafe.AsRef(firstOp), 16); + Unsafe.CopyBlockUnaligned(ref Unsafe.As(ref inArray[0]), ref Unsafe.AsRef(firstOp), 32); Unsafe.CopyBlockUnaligned(ref Unsafe.As(ref outArray[0]), ref Unsafe.AsRef(result), VectorSize); ValidateResult(inArray, outArray, method); diff --git a/src/tests/JIT/HardwareIntrinsics/X86_Avx512/Avx512F/ConvertToVector512Int64.Int32.cs b/src/tests/JIT/HardwareIntrinsics/X86_Avx512/Avx512F/ConvertToVector512Int64.Int32.cs index 34269547caa138..ae2bd5014fc7fe 100644 --- a/src/tests/JIT/HardwareIntrinsics/X86_Avx512/Avx512F/ConvertToVector512Int64.Int32.cs +++ b/src/tests/JIT/HardwareIntrinsics/X86_Avx512/Avx512F/ConvertToVector512Int64.Int32.cs @@ -105,7 +105,7 @@ static SimpleUnaryOpTest__ConvertToVector512Int64Int32() var random = new Random(); for (var i = 0; i < Op1ElementCount; i++) { _data[i] = (int)(random.Next(int.MinValue, int.MaxValue)); } - Unsafe.CopyBlockUnaligned(ref Unsafe.As, byte>(ref _clsVar), ref Unsafe.As(ref _data[0]), 16); + Unsafe.CopyBlockUnaligned(ref Unsafe.As, byte>(ref _clsVar), ref Unsafe.As(ref _data[0]), 32); } public SimpleUnaryOpTest__ConvertToVector512Int64Int32() @@ -115,7 +115,7 @@ public SimpleUnaryOpTest__ConvertToVector512Int64Int32() var random = new Random(); for (var i = 0; i < Op1ElementCount; i++) { _data[i] = (int)(random.Next(int.MinValue, int.MaxValue)); } - Unsafe.CopyBlockUnaligned(ref Unsafe.As, byte>(ref _fld), ref Unsafe.As(ref _data[0]), 16); + Unsafe.CopyBlockUnaligned(ref Unsafe.As, byte>(ref _fld), ref Unsafe.As(ref _data[0]), 32); for (var i = 0; i < Op1ElementCount; i++) { _data[i] = (int)(random.Next(int.MinValue, int.MaxValue)); } _dataTable = new SimpleUnaryOpTest__DataTable(_data, new Int64[RetElementCount], VectorSize); @@ -272,7 +272,7 @@ private void ValidateResult(void* firstOp, void* result, [CallerMemberName] stri Int32[] inArray = new Int32[Op1ElementCount]; Int64[] outArray = new Int64[RetElementCount]; - Unsafe.CopyBlockUnaligned(ref Unsafe.As(ref inArray[0]), ref Unsafe.AsRef(firstOp), 16); + Unsafe.CopyBlockUnaligned(ref Unsafe.As(ref inArray[0]), ref Unsafe.AsRef(firstOp), 32); Unsafe.CopyBlockUnaligned(ref Unsafe.As(ref outArray[0]), ref Unsafe.AsRef(result), VectorSize); ValidateResult(inArray, outArray, method); diff --git a/src/tests/JIT/HardwareIntrinsics/X86_Avx512/Avx512F/ConvertToVector512Int64.UInt32.cs b/src/tests/JIT/HardwareIntrinsics/X86_Avx512/Avx512F/ConvertToVector512Int64.UInt32.cs index ec444eae342eb2..5f13328315cabb 100644 --- a/src/tests/JIT/HardwareIntrinsics/X86_Avx512/Avx512F/ConvertToVector512Int64.UInt32.cs +++ b/src/tests/JIT/HardwareIntrinsics/X86_Avx512/Avx512F/ConvertToVector512Int64.UInt32.cs @@ -105,7 +105,7 @@ static SimpleUnaryOpTest__ConvertToVector512Int64UInt32() var random = new Random(); for (var i = 0; i < Op1ElementCount; i++) { _data[i] = (uint)(random.Next(0, int.MaxValue)); } - Unsafe.CopyBlockUnaligned(ref Unsafe.As, byte>(ref _clsVar), ref Unsafe.As(ref _data[0]), 16); + Unsafe.CopyBlockUnaligned(ref Unsafe.As, byte>(ref _clsVar), ref Unsafe.As(ref _data[0]), 32); } public SimpleUnaryOpTest__ConvertToVector512Int64UInt32() @@ -115,7 +115,7 @@ public SimpleUnaryOpTest__ConvertToVector512Int64UInt32() var random = new Random(); for (var i = 0; i < Op1ElementCount; i++) { _data[i] = (uint)(random.Next(0, int.MaxValue)); } - Unsafe.CopyBlockUnaligned(ref Unsafe.As, byte>(ref _fld), ref Unsafe.As(ref _data[0]), 16); + Unsafe.CopyBlockUnaligned(ref Unsafe.As, byte>(ref _fld), ref Unsafe.As(ref _data[0]), 32); for (var i = 0; i < Op1ElementCount; i++) { _data[i] = (uint)(random.Next(0, int.MaxValue)); } _dataTable = new SimpleUnaryOpTest__DataTable(_data, new UInt64[RetElementCount], VectorSize); @@ -272,7 +272,7 @@ private void ValidateResult(void* firstOp, void* result, [CallerMemberName] stri UInt32[] inArray = new UInt32[Op1ElementCount]; UInt64[] outArray = new UInt64[RetElementCount]; - Unsafe.CopyBlockUnaligned(ref Unsafe.As(ref inArray[0]), ref Unsafe.AsRef(firstOp), 16); + Unsafe.CopyBlockUnaligned(ref Unsafe.As(ref inArray[0]), ref Unsafe.AsRef(firstOp), 32); Unsafe.CopyBlockUnaligned(ref Unsafe.As(ref outArray[0]), ref Unsafe.AsRef(result), VectorSize); ValidateResult(inArray, outArray, method); diff --git a/src/tests/JIT/HardwareIntrinsics/X86_Avx512/Avx512F/ConvertToVector512UInt32.Int16.cs b/src/tests/JIT/HardwareIntrinsics/X86_Avx512/Avx512F/ConvertToVector512UInt32.Int16.cs index 74741dbac2490e..8da6a6b7a5a279 100644 --- a/src/tests/JIT/HardwareIntrinsics/X86_Avx512/Avx512F/ConvertToVector512UInt32.Int16.cs +++ b/src/tests/JIT/HardwareIntrinsics/X86_Avx512/Avx512F/ConvertToVector512UInt32.Int16.cs @@ -105,7 +105,7 @@ static SimpleUnaryOpTest__ConvertToVector512UInt32Int16() var random = new Random(); for (var i = 0; i < Op1ElementCount; i++) { _data[i] = (short)(random.Next(short.MinValue, short.MaxValue)); } - Unsafe.CopyBlockUnaligned(ref Unsafe.As, byte>(ref _clsVar), ref Unsafe.As(ref _data[0]), 16); + Unsafe.CopyBlockUnaligned(ref Unsafe.As, byte>(ref _clsVar), ref Unsafe.As(ref _data[0]), 32); } public SimpleUnaryOpTest__ConvertToVector512UInt32Int16() @@ -115,7 +115,7 @@ public SimpleUnaryOpTest__ConvertToVector512UInt32Int16() var random = new Random(); for (var i = 0; i < Op1ElementCount; i++) { _data[i] = (short)(random.Next(short.MinValue, short.MaxValue)); } - Unsafe.CopyBlockUnaligned(ref Unsafe.As, byte>(ref _fld), ref Unsafe.As(ref _data[0]), 16); + Unsafe.CopyBlockUnaligned(ref Unsafe.As, byte>(ref _fld), ref Unsafe.As(ref _data[0]), 32); for (var i = 0; i < Op1ElementCount; i++) { _data[i] = (short)(random.Next(short.MinValue, short.MaxValue)); } _dataTable = new SimpleUnaryOpTest__DataTable(_data, new Int32[RetElementCount], VectorSize); @@ -272,7 +272,7 @@ private void ValidateResult(void* firstOp, void* result, [CallerMemberName] stri Int16[] inArray = new Int16[Op1ElementCount]; Int32[] outArray = new Int32[RetElementCount]; - Unsafe.CopyBlockUnaligned(ref Unsafe.As(ref inArray[0]), ref Unsafe.AsRef(firstOp), 16); + Unsafe.CopyBlockUnaligned(ref Unsafe.As(ref inArray[0]), ref Unsafe.AsRef(firstOp), 32); Unsafe.CopyBlockUnaligned(ref Unsafe.As(ref outArray[0]), ref Unsafe.AsRef(result), VectorSize); ValidateResult(inArray, outArray, method); diff --git a/src/tests/JIT/HardwareIntrinsics/X86_Avx512/Avx512F/ConvertToVector512UInt32.UInt16.cs b/src/tests/JIT/HardwareIntrinsics/X86_Avx512/Avx512F/ConvertToVector512UInt32.UInt16.cs index 4d40e06766c6af..71815b0cb7441c 100644 --- a/src/tests/JIT/HardwareIntrinsics/X86_Avx512/Avx512F/ConvertToVector512UInt32.UInt16.cs +++ b/src/tests/JIT/HardwareIntrinsics/X86_Avx512/Avx512F/ConvertToVector512UInt32.UInt16.cs @@ -105,7 +105,7 @@ static SimpleUnaryOpTest__ConvertToVector512UInt32UInt16() var random = new Random(); for (var i = 0; i < Op1ElementCount; i++) { _data[i] = (ushort)(random.Next(0, ushort.MaxValue)); } - Unsafe.CopyBlockUnaligned(ref Unsafe.As, byte>(ref _clsVar), ref Unsafe.As(ref _data[0]), 16); + Unsafe.CopyBlockUnaligned(ref Unsafe.As, byte>(ref _clsVar), ref Unsafe.As(ref _data[0]), 32); } public SimpleUnaryOpTest__ConvertToVector512UInt32UInt16() @@ -115,7 +115,7 @@ public SimpleUnaryOpTest__ConvertToVector512UInt32UInt16() var random = new Random(); for (var i = 0; i < Op1ElementCount; i++) { _data[i] = (ushort)(random.Next(0, ushort.MaxValue)); } - Unsafe.CopyBlockUnaligned(ref Unsafe.As, byte>(ref _fld), ref Unsafe.As(ref _data[0]), 16); + Unsafe.CopyBlockUnaligned(ref Unsafe.As, byte>(ref _fld), ref Unsafe.As(ref _data[0]), 32); for (var i = 0; i < Op1ElementCount; i++) { _data[i] = (ushort)(random.Next(0, ushort.MaxValue)); } _dataTable = new SimpleUnaryOpTest__DataTable(_data, new UInt32[RetElementCount], VectorSize); @@ -272,7 +272,7 @@ private void ValidateResult(void* firstOp, void* result, [CallerMemberName] stri UInt16[] inArray = new UInt16[Op1ElementCount]; UInt32[] outArray = new UInt32[RetElementCount]; - Unsafe.CopyBlockUnaligned(ref Unsafe.As(ref inArray[0]), ref Unsafe.AsRef(firstOp), 16); + Unsafe.CopyBlockUnaligned(ref Unsafe.As(ref inArray[0]), ref Unsafe.AsRef(firstOp), 32); Unsafe.CopyBlockUnaligned(ref Unsafe.As(ref outArray[0]), ref Unsafe.AsRef(result), VectorSize); ValidateResult(inArray, outArray, method); diff --git a/src/tests/JIT/HardwareIntrinsics/X86_Avx512/Avx512F/ConvertToVector512UInt64.Int32.cs b/src/tests/JIT/HardwareIntrinsics/X86_Avx512/Avx512F/ConvertToVector512UInt64.Int32.cs index 746bcc7d915721..abc3d7bb06ac89 100644 --- a/src/tests/JIT/HardwareIntrinsics/X86_Avx512/Avx512F/ConvertToVector512UInt64.Int32.cs +++ b/src/tests/JIT/HardwareIntrinsics/X86_Avx512/Avx512F/ConvertToVector512UInt64.Int32.cs @@ -105,7 +105,7 @@ static SimpleUnaryOpTest__ConvertToVector512UInt64Int32() var random = new Random(); for (var i = 0; i < Op1ElementCount; i++) { _data[i] = (int)(random.Next(int.MinValue, int.MaxValue)); } - Unsafe.CopyBlockUnaligned(ref Unsafe.As, byte>(ref _clsVar), ref Unsafe.As(ref _data[0]), 16); + Unsafe.CopyBlockUnaligned(ref Unsafe.As, byte>(ref _clsVar), ref Unsafe.As(ref _data[0]), 32); } public SimpleUnaryOpTest__ConvertToVector512UInt64Int32() @@ -115,7 +115,7 @@ public SimpleUnaryOpTest__ConvertToVector512UInt64Int32() var random = new Random(); for (var i = 0; i < Op1ElementCount; i++) { _data[i] = (int)(random.Next(int.MinValue, int.MaxValue)); } - Unsafe.CopyBlockUnaligned(ref Unsafe.As, byte>(ref _fld), ref Unsafe.As(ref _data[0]), 16); + Unsafe.CopyBlockUnaligned(ref Unsafe.As, byte>(ref _fld), ref Unsafe.As(ref _data[0]), 32); for (var i = 0; i < Op1ElementCount; i++) { _data[i] = (int)(random.Next(int.MinValue, int.MaxValue)); } _dataTable = new SimpleUnaryOpTest__DataTable(_data, new Int64[RetElementCount], VectorSize); @@ -272,7 +272,7 @@ private void ValidateResult(void* firstOp, void* result, [CallerMemberName] stri Int32[] inArray = new Int32[Op1ElementCount]; Int64[] outArray = new Int64[RetElementCount]; - Unsafe.CopyBlockUnaligned(ref Unsafe.As(ref inArray[0]), ref Unsafe.AsRef(firstOp), 16); + Unsafe.CopyBlockUnaligned(ref Unsafe.As(ref inArray[0]), ref Unsafe.AsRef(firstOp), 32); Unsafe.CopyBlockUnaligned(ref Unsafe.As(ref outArray[0]), ref Unsafe.AsRef(result), VectorSize); ValidateResult(inArray, outArray, method); diff --git a/src/tests/JIT/HardwareIntrinsics/X86_Avx512/Avx512F/ConvertToVector512UInt64.UInt32.cs b/src/tests/JIT/HardwareIntrinsics/X86_Avx512/Avx512F/ConvertToVector512UInt64.UInt32.cs index 9f8ea7c5bc41fa..d9e876b084ab1e 100644 --- a/src/tests/JIT/HardwareIntrinsics/X86_Avx512/Avx512F/ConvertToVector512UInt64.UInt32.cs +++ b/src/tests/JIT/HardwareIntrinsics/X86_Avx512/Avx512F/ConvertToVector512UInt64.UInt32.cs @@ -105,7 +105,7 @@ static SimpleUnaryOpTest__ConvertToVector512UInt64UInt32() var random = new Random(); for (var i = 0; i < Op1ElementCount; i++) { _data[i] = (uint)(random.Next(0, int.MaxValue)); } - Unsafe.CopyBlockUnaligned(ref Unsafe.As, byte>(ref _clsVar), ref Unsafe.As(ref _data[0]), 16); + Unsafe.CopyBlockUnaligned(ref Unsafe.As, byte>(ref _clsVar), ref Unsafe.As(ref _data[0]), 32); } public SimpleUnaryOpTest__ConvertToVector512UInt64UInt32() @@ -115,7 +115,7 @@ public SimpleUnaryOpTest__ConvertToVector512UInt64UInt32() var random = new Random(); for (var i = 0; i < Op1ElementCount; i++) { _data[i] = (uint)(random.Next(0, int.MaxValue)); } - Unsafe.CopyBlockUnaligned(ref Unsafe.As, byte>(ref _fld), ref Unsafe.As(ref _data[0]), 16); + Unsafe.CopyBlockUnaligned(ref Unsafe.As, byte>(ref _fld), ref Unsafe.As(ref _data[0]), 32); for (var i = 0; i < Op1ElementCount; i++) { _data[i] = (uint)(random.Next(0, int.MaxValue)); } _dataTable = new SimpleUnaryOpTest__DataTable(_data, new UInt64[RetElementCount], VectorSize); @@ -272,7 +272,7 @@ private void ValidateResult(void* firstOp, void* result, [CallerMemberName] stri UInt32[] inArray = new UInt32[Op1ElementCount]; UInt64[] outArray = new UInt64[RetElementCount]; - Unsafe.CopyBlockUnaligned(ref Unsafe.As(ref inArray[0]), ref Unsafe.AsRef(firstOp), 16); + Unsafe.CopyBlockUnaligned(ref Unsafe.As(ref inArray[0]), ref Unsafe.AsRef(firstOp), 32); Unsafe.CopyBlockUnaligned(ref Unsafe.As(ref outArray[0]), ref Unsafe.AsRef(result), VectorSize); ValidateResult(inArray, outArray, method); diff --git a/src/tests/JIT/HardwareIntrinsics/X86_Avx512/Avx512F/UnpackLow.cs b/src/tests/JIT/HardwareIntrinsics/X86_Avx512/Avx512F/UnpackLow.cs index a1081b27455176..405003ece34ed9 100644 --- a/src/tests/JIT/HardwareIntrinsics/X86_Avx512/Avx512F/UnpackLow.cs +++ b/src/tests/JIT/HardwareIntrinsics/X86_Avx512/Avx512F/UnpackLow.cs @@ -24,8 +24,8 @@ public static unsafe void UnpackLow() using (TestTable_2Input doubleTable = new TestTable_2Input(new double[8] { 1, -5, 100, 0, 1, -5, 100, 0 }, new double[8] { 22, -1, -50, 0, 22, -1, -50, 0 }, new double[8])) { - var vf1 = Unsafe.Read>(floatTable.inArray1Ptr); - var vf2 = Unsafe.Read>(floatTable.inArray2Ptr); + var vf1 = Unsafe.Read>(floatTable.inArray1Ptr); + var vf2 = Unsafe.Read>(floatTable.inArray2Ptr); var vf3 = Avx512F.UnpackLow(vf1, vf2); Unsafe.Write(floatTable.outArrayPtr, vf3); @@ -48,8 +48,8 @@ public static unsafe void UnpackLow() testResult = Fail; } - var vd1 = Unsafe.Read>(doubleTable.inArray1Ptr); - var vd2 = Unsafe.Read>(doubleTable.inArray2Ptr); + var vd1 = Unsafe.Read>(doubleTable.inArray1Ptr); + var vd2 = Unsafe.Read>(doubleTable.inArray2Ptr); var vd3 = Avx512F.UnpackLow(vd1, vd2); Unsafe.Write(doubleTable.outArrayPtr, vd3); From 0c05a428a0c1acfc6312602ff7f5686e44e7faa3 Mon Sep 17 00:00:00 2001 From: Tanner Gooding Date: Wed, 19 Apr 2023 07:46:23 -0700 Subject: [PATCH 10/10] Fix a mistyped intrinsic id --- src/coreclr/jit/hwintrinsiclistxarch.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/coreclr/jit/hwintrinsiclistxarch.h b/src/coreclr/jit/hwintrinsiclistxarch.h index 3e81d3f3da3f36..57476944fed88d 100644 --- a/src/coreclr/jit/hwintrinsiclistxarch.h +++ b/src/coreclr/jit/hwintrinsiclistxarch.h @@ -801,7 +801,7 @@ HARDWARE_INTRINSIC(AVX512F, ConvertToVector128UInt16, HARDWARE_INTRINSIC(AVX512F, ConvertToVector128UInt32, -1, 1, {INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_vpmovqd, INS_vpmovqd, INS_invalid, INS_invalid}, HW_Category_SimpleSIMD, HW_Flag_BaseTypeFromFirstArg|HW_Flag_SpecialCodeGen) HARDWARE_INTRINSIC(AVX512F, ConvertToVector256Int16, 64, 1, {INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_vpmovdw, INS_vpmovdw, INS_invalid, INS_invalid, INS_invalid, INS_invalid}, HW_Category_SimpleSIMD, HW_Flag_BaseTypeFromFirstArg|HW_Flag_SpecialCodeGen) HARDWARE_INTRINSIC(AVX512F, ConvertToVector256Int32, 64, 1, {INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_vpmovqd, INS_vpmovqd, INS_invalid, INS_cvtpd2dq}, HW_Category_SimpleSIMD, HW_Flag_BaseTypeFromFirstArg|HW_Flag_SpecialCodeGen) -HARDWARE_INTRINSIC(AVX512F, ConvertToVector128Int32WithTruncation, 64, 1, {INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_cvttpd2dq}, HW_Category_SimpleSIMD, HW_Flag_BaseTypeFromFirstArg) +HARDWARE_INTRINSIC(AVX512F, ConvertToVector256Int32WithTruncation, 64, 1, {INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_cvttpd2dq}, HW_Category_SimpleSIMD, HW_Flag_BaseTypeFromFirstArg) HARDWARE_INTRINSIC(AVX512F, ConvertToVector256Single, 64, 1, {INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_cvtpd2ps}, HW_Category_SimpleSIMD, HW_Flag_BaseTypeFromFirstArg) HARDWARE_INTRINSIC(AVX512F, ConvertToVector256UInt16, 64, 1, {INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_vpmovdw, INS_vpmovdw, INS_invalid, INS_invalid, INS_invalid, INS_invalid}, HW_Category_SimpleSIMD, HW_Flag_BaseTypeFromFirstArg|HW_Flag_SpecialCodeGen) HARDWARE_INTRINSIC(AVX512F, ConvertToVector256UInt32, 64, 1, {INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_invalid, INS_vpmovqd, INS_vpmovqd, INS_invalid, INS_invalid}, HW_Category_SimpleSIMD, HW_Flag_BaseTypeFromFirstArg|HW_Flag_SpecialCodeGen)