Author: mav
Date: Mon Jul 27 00:25:56 2020
New Revision: 363588
URL: https://svnweb.freebsd.org/changeset/base/363588

Log:
  MFC r355666: libpmc: sort some amdfam17h entries to make valid json

Modified:
  stable/12/lib/libpmc/pmu-events/arch/x86/amdfam17h/core.json
  stable/12/lib/libpmc/pmu-events/arch/x86/amdfam17h/memory.json
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/lib/libpmc/pmu-events/arch/x86/amdfam17h/core.json
==============================================================================
--- stable/12/lib/libpmc/pmu-events/arch/x86/amdfam17h/core.json        Sun Jul 
26 23:13:10 2020        (r363587)
+++ stable/12/lib/libpmc/pmu-events/arch/x86/amdfam17h/core.json        Mon Jul 
27 00:25:56 2020        (r363588)
@@ -2,20 +2,20 @@
  {
  "EventName": "ex_ret_instr",
  "EventCode": "0xc0",
+ "SampleAfterValue": "2000003",
  "BriefDescription": "Retired Instructions."
-  "SampleAfterValue": "2000003",
  },
  {
  "EventName": "ex_ret_cops",
  "EventCode": "0xc1",
+ "SampleAfterValue": "2000003",
  "BriefDescription": "The number of uOps retired. This includes all processor 
activity (instructions, exceptions, interrupts, microcode assists, etc.). The 
number of events logged per cycle can vary from 0 to 4."
-  "SampleAfterValue": "2000003",
  },
  {
  "EventName": "ex_ret_brn",
  "EventCode": "0xc2",
+ "SampleAfterValue": "2000003",
  "BriefDescription": "The number of branch instructions retired. This includes 
all types of architectural control flow changes, including exceptions and 
interrupts."
-  "SampleAfterValue": "2000003",
  },
  {
  "EventName": "ex_ret_brn_misp",

Modified: stable/12/lib/libpmc/pmu-events/arch/x86/amdfam17h/memory.json
==============================================================================
--- stable/12/lib/libpmc/pmu-events/arch/x86/amdfam17h/memory.json      Sun Jul 
26 23:13:10 2020        (r363587)
+++ stable/12/lib/libpmc/pmu-events/arch/x86/amdfam17h/memory.json      Mon Jul 
27 00:25:56 2020        (r363588)
@@ -220,7 +220,7 @@
  {
  "EventName": "ls_not_halted_cyc",
  "EventCode": "0x76",
- "BriefDescription": "Cycles not in Halt."
  "SampleAfterValue": "2000003",
+ "BriefDescription": "Cycles not in Halt."
  }
 ]
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"

Reply via email to