More work

Author: TIHan

src/coreclr/jit/fgdiagnostic.cpp

@@ -3459,6 +3459,10 @@ void Compiler::fgDebugCheckFlags(GenTree* tree, BasicBlock* block)
 
 #if defined(TARGET_ARM64)
                     case NI_ArmBase_Yield:
+                    case NI_Sve_PrefetchBytes:
+                    case NI_Sve_PrefetchInt16:
+                    case NI_Sve_PrefetchInt32:
+                    case NI_Sve_PrefetchInt64:
                     {
                         assert(tree->OperRequiresCallFlag(this));
                         expectedFlags |= GTF_GLOB_REF;

src/coreclr/jit/gentree.cpp

@@ -27315,6 +27315,10 @@ bool GenTreeHWIntrinsic::OperRequiresCallFlag() const
 
 #if defined(TARGET_ARM64)
             case NI_ArmBase_Yield:
+            case NI_Sve_PrefetchBytes:
+            case NI_Sve_PrefetchInt16:
+            case NI_Sve_PrefetchInt32:
+            case NI_Sve_PrefetchInt64:
             {
                 return true;
             }
@@ -27497,6 +27501,10 @@ void GenTreeHWIntrinsic::Initialize(NamedIntrinsic intrinsicId)
 
 #if defined(TARGET_ARM64)
             case NI_ArmBase_Yield:
+            case NI_Sve_PrefetchBytes:
+            case NI_Sve_PrefetchInt16:
+            case NI_Sve_PrefetchInt32:
+            case NI_Sve_PrefetchInt64:
             {
                 // Mark as a call and global reference, much as is done for GT_KEEPALIVE
                 gtFlags |= (GTF_CALL | GTF_GLOB_REF);

src/coreclr/jit/hwintrinsiccodegenarm64.cpp

@@ -306,8 +306,6 @@ void CodeGen::genHWIntrinsic(GenTreeHWIntrinsic* node)
     }
     else if (intrin.category == HW_Category_Special)
     {
-        assert(intrin.id == NI_ArmBase_Yield);
-
         emitSize = EA_UNKNOWN;
         opt      = INS_OPTS_NONE;
     }

src/tests/JIT/HardwareIntrinsics/Arm/Shared/SvePrefetchTest.template

@@ -154,7 +154,15 @@ namespace JIT.HardwareIntrinsics.Arm
             {Isa}.{Method}(loadMask, ({Op1BaseType}*)(_dataTable.inArrayPtr), (SvePrefetchType)7);
             {Isa}.{Method}(loadMask, ({Op1BaseType}*)(_dataTable.inArrayPtr), (SvePrefetchType)14);
             {Isa}.{Method}(loadMask, ({Op1BaseType}*)(_dataTable.inArrayPtr), (SvePrefetchType)15);
-            {Isa}.{Method}(loadMask, ({Op1BaseType}*)(_dataTable.inArrayPtr), (SvePrefetchType)123);
+
+            try
+            {
+                {Isa}.{Method}(loadMask, ({Op1BaseType}*)(_dataTable.inArrayPtr), (SvePrefetchType)123);
+                Succeeded = false;
+            }
+            catch (ArgumentException)
+            {
+            }
 
             PrefetchWrapper(SvePrefetchType.SV_PLDL1KEEP);
             PrefetchWrapper(SvePrefetchType.SV_PLDL1STRM);
@@ -172,7 +180,15 @@ namespace JIT.HardwareIntrinsics.Arm
             PrefetchWrapper((SvePrefetchType)7);
             PrefetchWrapper((SvePrefetchType)14);
             PrefetchWrapper((SvePrefetchType)15);
-            PrefetchWrapper((SvePrefetchType)123);
+
+            try
+            {
+                PrefetchWrapper((SvePrefetchType)123);
+                Succeeded = false;
+            }
+            catch (ArgumentException)
+            {
+            }
         }
 
         public void RunBasicScenario_FalseMask()