From 90cc77802f89a32ab77c314fd9d4cce30f4663b1 Mon Sep 17 00:00:00 2001
From: hltaylor26 <79609783+hltaylor26@users.noreply.github.com>
Date: Wed, 13 Apr 2022 16:24:44 -0400
Subject: [PATCH 1/2] RAPL support

---
 etl/js/config/supremm/dataset_maps/pcp.js | 18 ++++++
 etl/js/config/supremm/etl.schema.js       | 78 +++++++++++++++++++++++
 2 files changed, 96 insertions(+)

diff --git a/etl/js/config/supremm/dataset_maps/pcp.js b/etl/js/config/supremm/dataset_maps/pcp.js
index ba1f2a29..b5c67b0f 100644
--- a/etl/js/config/supremm/dataset_maps/pcp.js
+++ b/etl/js/config/supremm/dataset_maps/pcp.js
@@ -514,6 +514,24 @@ module.exports = function(config) {
                     return this.getmax(job, 'ipmi.power.max');
                 }
             },
+            "rapl_energy_pkg": {
+                ref: 'rapl.energy.pkg.avg'
+            }, 
+            "rapl_energy_cores": {
+                ref: 'rapl.energy.cores.avg'
+            }, 
+            "rapl_energy_dram": {
+                ref: 'rapl.energy.dram.avg'
+            },
+            "rapl_power_pkg": {
+                ref: 'rapl.power.pkg'
+            }, 
+            "rapl_power_cores": {
+                ref: 'rapl.power.cores'
+            }, 
+            "rapl_power_dram": {
+                ref: 'rapl.power.dram'
+            },
             "memory_used": {
                 formula: function(job) {
                     var mem = this.ref(job, "memory.used_minus_cache.avg");
diff --git a/etl/js/config/supremm/etl.schema.js b/etl/js/config/supremm/etl.schema.js
index cc67d7f8..d337b962 100644
--- a/etl/js/config/supremm/etl.schema.js
+++ b/etl/js/config/supremm/etl.schema.js
@@ -1217,6 +1217,84 @@ module.exports = {
             table: 'job'
         },
 
+        rapl_energy_pkg: {
+            unit: 'joules',
+            type: 'double',
+            name: 'RAPL Energy Pkg',
+            nullable: true,
+            group: 'Energy Usage Statistics',
+            def: null,
+            batchExport: true,
+            comments: 'An estimate of the energy consumption of all cores + LLC cache during the job.',
+            per: 'node',
+            table: 'job'
+        },
+
+        rapl_energy_cores: {
+            unit: 'joules',
+            type: 'double',
+            name: 'RAPL Energy Cores',
+            nullable: true,
+            group: 'Energy Usage Statistics',
+            def: null,
+            batchExport: true,
+            comments: 'An estimate of the energy consumption of all cores on socket during the job.',
+            per: 'node',
+            table: 'job'
+        },
+
+        rapl_energy_dram: {
+            unit: 'joules',
+            type: 'double',
+            name: 'RAPL Energy Cores',
+            nullable: true,
+            group: 'Energy Usage Statistics',
+            def: null,
+            batchExport: true,
+            comments: 'An estimate of the energy consumption of DRAM during the job.',
+            per: 'node',
+            table: 'job'
+        },
+
+        rapl_power_pkg: {
+            unit: 'watts',
+            type: 'double',
+            name: 'RAPL Energy Cores',
+            nullable: true,
+            group: 'Energy Usage Statistics',
+            def: null,
+            batchExport: true,
+            comments: 'An estimate of the power consumption of all cores + LLC cache during the job.',
+            per: 'node',
+            table: 'job'
+        },
+
+        rapl_power_cores: {
+            unit: 'watts',
+            type: 'double',
+            name: 'RAPL Energy Cores',
+            nullable: true,
+            group: 'Energy Usage Statistics',
+            def: null,
+            batchExport: true,
+            comments: 'An estimate of the power consumption of all cores on socket during the job.',
+            per: 'node',
+            table: 'job'
+        },
+
+        rapl_power_dram: {
+            unit: 'watts',
+            type: 'double',
+            name: 'RAPL Energy Cores',
+            nullable: true,
+            group: 'Energy Usage Statistics',
+            def: null,
+            batchExport: true,
+            comments: 'An estimate of the power consumption of DRAM during the job.',
+            per: 'node',
+            table: 'job'
+        },
+
         mem_transferred: {
             unit: "bytes",
             type: "double",

From 6affe4ccb5512d90fd8d3044055c41113982501c Mon Sep 17 00:00:00 2001
From: hltaylor26 <79609783+hltaylor26@users.noreply.github.com>
Date: Wed, 13 Apr 2022 16:38:44 -0400
Subject: [PATCH 2/2] Style changes

---
 etl/js/config/supremm/dataset_maps/pcp.js | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/etl/js/config/supremm/dataset_maps/pcp.js b/etl/js/config/supremm/dataset_maps/pcp.js
index b5c67b0f..ea615947 100644
--- a/etl/js/config/supremm/dataset_maps/pcp.js
+++ b/etl/js/config/supremm/dataset_maps/pcp.js
@@ -514,22 +514,22 @@ module.exports = function(config) {
                     return this.getmax(job, 'ipmi.power.max');
                 }
             },
-            "rapl_energy_pkg": {
+            rapl_energy_pkg: {
                 ref: 'rapl.energy.pkg.avg'
-            }, 
-            "rapl_energy_cores": {
+            },
+            rapl_energy_cores: {
                 ref: 'rapl.energy.cores.avg'
-            }, 
-            "rapl_energy_dram": {
+            },
+            rapl_energy_dram: {
                 ref: 'rapl.energy.dram.avg'
             },
-            "rapl_power_pkg": {
+            rapl_power_pkg: {
                 ref: 'rapl.power.pkg'
-            }, 
-            "rapl_power_cores": {
+            },
+            rapl_power_cores: {
                 ref: 'rapl.power.cores'
-            }, 
-            "rapl_power_dram": {
+            },
+            rapl_power_dram: {
                 ref: 'rapl.power.dram'
             },
             "memory_used": {