jit format and fix a bug

src/coreclr/jit/compiler.cpp

@@ -5272,7 +5272,6 @@ void Compiler::placeLoopAlignInstructions()
             minBlockSoFar = BB_MAX_WEIGHT;
             bbHavingAlign = nullptr;
 
-
             if (--loopsToProcess == 0)
             {
                 break;

src/coreclr/jit/emit.h

@@ -1389,9 +1389,9 @@ class emitter
                                            // If no 'jmp' instructions were found until idaLoopHeadPredIG,
                                            // then idaLoopHeadPredIG == idaIG.
 #ifdef DEBUG
-        bool isPlacedAfterJmp;             // Is the 'align' instruction placed after jmp. Used to decide
-                                           // if the instruction cost should be included in PerfScore
-                                           // calculation or not.
+        bool isPlacedAfterJmp; // Is the 'align' instruction placed after jmp. Used to decide
+                               // if the instruction cost should be included in PerfScore
+                               // calculation or not.
 #endif
 
         inline insGroup* loopHeadIG()
@@ -1804,14 +1804,14 @@ class emitter
 
     unsigned getLoopSize(insGroup* igLoopHeader,
                          unsigned maxLoopSize DEBUG_ARG(bool isAlignAdjusted)); // Get the smallest loop size
-    void     emitLoopAlignment(DEBUG_ARG1(bool isPlacedBehindJmp));
+    void emitLoopAlignment(DEBUG_ARG1(bool isPlacedBehindJmp));
     bool emitEndsWithAlignInstr(); // Validate if newLabel is appropriate
     void emitSetLoopBackEdge(BasicBlock* loopTopBlock);
     void     emitLoopAlignAdjustments(); // Predict if loop alignment is needed and make appropriate adjustments
     unsigned emitCalculatePaddingForLoopAlignment(insGroup* ig, size_t offset DEBUG_ARG(bool isAlignAdjusted));
 
-    void            emitLoopAlign(unsigned paddingBytes, bool isFirstAlign DEBUG_ARG(bool isPlacedBehindJmp));
-    void            emitLongLoopAlign(unsigned alignmentBoundary DEBUG_ARG(bool isPlacedBehindJmp));
+    void emitLoopAlign(unsigned paddingBytes, bool isFirstAlign DEBUG_ARG(bool isPlacedBehindJmp));
+    void emitLongLoopAlign(unsigned alignmentBoundary DEBUG_ARG(bool isPlacedBehindJmp));
     instrDescAlign* emitAlignInNextIG(instrDescAlign* alignInstr);
     void emitConnectAlignInstrWithCurIG();
 

src/coreclr/jit/optimizer.cpp

@@ -2517,9 +2517,15 @@ void Compiler::optIdentifyLoopsForAlignment()
                 weight_t    topWeight = top->getBBWeight(this);
                 if (topWeight >= (opts.compJitAlignLoopMinBlockWeight * BB_UNITY_WEIGHT))
                 {
-                    loopAlignCandidates++;
-                    JITDUMP(FMT_LP " that starts at " FMT_BB " needs alignment, weight=" FMT_WT ".\n", loopInd,
-                            top->bbNum, topWeight);
+                    // Sometimes with JitOptRepeat > 1, we might end up finding the loops twice. In such
+                    // cases, make sure to count them just once.
+                    if (!first->isLoopAlign())
+                    {
+                        loopAlignCandidates++;
+                        top->bbFlags |= BBF_LOOP_ALIGN;
+                        JITDUMP(FMT_LP " that starts at " FMT_BB " needs alignment, weight=" FMT_WT ".\n", loopInd,
+                                top->bbNum, top->getBBWeight(this));
+                    }
                 }
                 else
                 {