[TD] Update diagnostics test data due to new test runners

Update includes:
- Changing syntax of `OI/`NI` tags from `<!NI;TAG!>` to `<!TAG{NI}!>`
- Fix some incorrect directives
- Change order of diagnostics in some places
- Remove ignored diagnostics from FIR test data (previously `DIAGNOSTICS` didn't work)
- Update FIR dumps in some places and add `FIR_IDENTICAL` if needed
- Replace all JAVAC_SKIP with SKIP_JAVAC directive

compiler/testData/diagnostics/tests/GenericArgumentConsistency.kt

@@ -1,4 +1,4 @@
-// FILE: b.kt
+// FILE: a.kt
 interface A<in T> {}
 interface B<T> : A<Int> {}
 interface C<T> : <!INCONSISTENT_TYPE_PARAMETER_VALUES!>B<T>, A<T><!> {}
@@ -21,23 +21,23 @@ package x
     interface AB3 : AA1<Comparable<Int>> {}
     interface AB2 : <!INCONSISTENT_TYPE_PARAMETER_VALUES!>AA1<Number>, AB1, AB3<!> {}
 
-// FILE: b.kt
+// FILE: c.kt
 package x2
     interface AA1<out T> {}
     interface AB1 : AA1<Any> {}
     interface AB3 : AA1<Comparable<Int>> {}
     interface AB2 : <!INCONSISTENT_TYPE_PARAMETER_VALUES!>AA1<Number>, AB1, AB3<!> {}
 
-// FILE: b.kt
+// FILE: d.kt
 package x3
     interface AA1<in T> {}
     interface AB1 : AA1<Any> {}
     interface AB3 : AA1<Comparable<Int>> {}
     interface AB2 : <!INCONSISTENT_TYPE_PARAMETER_VALUES!>AA1<Number>, AB1, AB3<!> {}
 
-// FILE: b.kt
+// FILE: e.kt
 package sx2
     interface AA1<in T> {}
     interface AB1 : AA1<Int> {}
     interface AB3 : AA1<Comparable<Int>> {}
-    interface AB2 : <!INCONSISTENT_TYPE_PARAMETER_VALUES!>AA1<Number>, AB1, AB3<!> {}
+    interface AB2 : <!INCONSISTENT_TYPE_PARAMETER_VALUES!>AA1<Number>, AB1, AB3<!> {}