Skip to content

Commit 6aad0e7

Browse files
committed
In .net8 there is no grouping
1 parent 330ca36 commit 6aad0e7

File tree

1 file changed

+17
-5
lines changed

1 file changed

+17
-5
lines changed

tests/ImageSharp.Tests/TestUtilities/Tests/FeatureTestRunnerTests.cs

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -115,21 +115,26 @@ static void AssertHwIntrinsicsFeatureDisabled(string intrinsic)
115115
Assert.False(Pclmulqdq.IsSupported);
116116
break;
117117
case HwIntrinsics.DisableSSE42:
118+
#if NET10_0_OR_GREATER
118119
Assert.False(Sse3.IsSupported, "Sse3 should be disabled.");
119120
Assert.False(Ssse3.IsSupported, "Ssse3 should be disabled.");
120121
Assert.False(Sse41.IsSupported, "Sse41 should be disabled.");
121-
Assert.False(Sse42.IsSupported, "Sse42 should be disabled.");
122122
Assert.False(Popcnt.IsSupported, "Popcnt should be disabled.");
123+
#else
124+
Assert.False(Sse42.IsSupported, "Sse42 should be disabled.");
125+
#endif
123126
break;
124127
case HwIntrinsics.DisableAVX:
125128
Assert.False(Avx.IsSupported);
126129
break;
127130
case HwIntrinsics.DisableAVX2:
128131
Assert.False(Avx2.IsSupported);
132+
#if NET10_0_OR_GREATER
129133
Assert.False(Fma.IsSupported);
130134
Assert.False(Bmi1.IsSupported);
131135
Assert.False(Bmi2.IsSupported);
132136
Assert.False(Lzcnt.IsSupported);
137+
#endif
133138
break;
134139
case HwIntrinsics.DisableArm64Aes:
135140
Assert.False(System.Runtime.Intrinsics.Arm.Aes.IsSupported);
@@ -206,23 +211,30 @@ static void AssertHwIntrinsicsFeatureDisabled(string serializable, string intrin
206211
break;
207212
case HwIntrinsics.DisableAES:
208213
Assert.False(Aes.IsSupported);
214+
#if NET10_0_OR_GREATER
209215
Assert.False(Pclmulqdq.IsSupported);
216+
#endif
210217
break;
211218
case HwIntrinsics.DisableSSE42:
212-
Assert.False(Ssse3.IsSupported);
213-
Assert.False(Sse41.IsSupported);
214-
Assert.False(Sse42.IsSupported);
215-
Assert.False(Popcnt.IsSupported);
219+
#if NET10_0_OR_GREATER
220+
Assert.False(Sse3.IsSupported, "Sse3 should be disabled.");
221+
Assert.False(Ssse3.IsSupported, "Ssse3 should be disabled.");
222+
Assert.False(Sse41.IsSupported, "Sse41 should be disabled.");
223+
Assert.False(Popcnt.IsSupported, "Popcnt should be disabled.");
224+
#endif
225+
Assert.False(Sse42.IsSupported, "Sse42 should be disabled.");
216226
break;
217227
case HwIntrinsics.DisableAVX:
218228
Assert.False(Avx.IsSupported);
219229
break;
220230
case HwIntrinsics.DisableAVX2:
221231
Assert.False(Avx2.IsSupported);
232+
#if NET10_0_OR_GREATER
222233
Assert.False(Fma.IsSupported);
223234
Assert.False(Bmi1.IsSupported);
224235
Assert.False(Bmi2.IsSupported);
225236
Assert.False(Lzcnt.IsSupported);
237+
#endif
226238
break;
227239
case HwIntrinsics.DisableArm64Aes:
228240
Assert.False(System.Runtime.Intrinsics.Arm.Aes.IsSupported);

0 commit comments

Comments
 (0)