change cpu_time unit (us to ms)

Signed-off-by: Sunyanan Choochotkaew <[email protected]>
sustainable-computing-io · Feb 2, 2024 · 0278c38 · 0278c38
1 parent dc4d631
commit 0278c38
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/cmd/cmd_util.py b/cmd/cmd_util.py
@@ -58,7 +58,7 @@ def summary_validation(validate_df):
         # CPU instruction is mainly used for ratio.
         # reference:  https://github.com/sustainable-computing-io/kepler/blob/0b328cf7c79db9a11426fb80a1a922383e40197c/pkg/config/config.go#L92
         "hwc": "kepler_container_cpu_instructions_total", 
-        "bpf": "kepler_container_bpf_cpu_time_us_total",
+        "bpf": "kepler_container_bpf_cpu_time_ms_total",
     }
     metric_to_validate_power = {
         "intel_rapl": "kepler_node_package_joules_total",

diff --git a/manifests/kepler/patch/patch-ci.yaml b/manifests/kepler/patch/patch-ci.yaml
@@ -17,4 +17,4 @@ spec:
       containers:
       - name: kepler-exporter
         imagePullPolicy: IfNotPresent
-        image: quay.io/sustainable_computing_io/kepler:latest-libbpf
+        image: quay.io/sustainable_computing_io/kepler:latest
diff --git a/model_training/script.sh b/model_training/script.sh
@@ -3,7 +3,7 @@
 set -e
 # Supported CLUSTER_PROVIDER are kind,microshift
 export CLUSTER_PROVIDER=${CLUSTER_PROVIDER:-kind}
-export IMAGE_TAG=${IMAGE_TAG:-latest-libbpf}
+export IMAGE_TAG=${IMAGE_TAG:-latest}
 export KIND_CLUSTER_NAME=${KIND_CLUSTER_NAME:-kind-for-training}
 export KIND_REGISTRY_NAME=${KIND_REGISTRY_NAME:-kind-registry-for-training}
 export REGISTRY_PORT=${REGISTRY_PORT:-5101}

diff --git a/src/util/prom_types.py b/src/util/prom_types.py
@@ -35,7 +35,7 @@
 
 usage_ratio_query = "kepler_container_cpu_usage_per_package_ratio"
 # mostly available
-valid_container_query = "kepler_container_bpf_cpu_time_us_total"
+valid_container_query = "kepler_container_bpf_cpu_time_ms_total"
 node_info_query = "kepler_node_node_info"
 cpu_frequency_info_query = "kepler_node_cpu_scaling_frequency_hertz"
 

diff --git a/src/util/train_types.py b/src/util/train_types.py
@@ -16,7 +16,7 @@
 
 COUNTER_FEAUTRES = ["cache_miss", "cpu_cycles", "cpu_instructions"]
 CGROUP_FEATURES = ["cgroupfs_cpu_usage_us", "cgroupfs_memory_usage_bytes", "cgroupfs_system_cpu_usage_us", "cgroupfs_user_cpu_usage_us"]
-BPF_FEATURES = ["bpf_cpu_time_us", "bpf_page_cache_hit"]
+BPF_FEATURES = ["bpf_cpu_time_ms", "bpf_page_cache_hit"]
 IRQ_FEATURES = ["bpf_block_irq", "bpf_net_rx_irq", "bpf_net_tx_irq"]
 ACCELERATE_FEATURES = ['accelerator_intel_qat']
 WORKLOAD_FEATURES = COUNTER_FEAUTRES + CGROUP_FEATURES + BPF_FEATURES + IRQ_FEATURES + ACCELERATE_FEATURES
@@ -97,8 +97,8 @@ def is_single_source_feature_group(fg):
     FeatureGroup.WorkloadOnly: "cpu_instructions",
     FeatureGroup.CounterOnly: "cpu_instructions",
     FeatureGroup.CgroupOnly: "cgroupfs_cpu_usage_us",
-    FeatureGroup.BPFOnly: "bpf_cpu_time_us",
-    FeatureGroup.BPFIRQ: "bpf_cpu_time_us",
+    FeatureGroup.BPFOnly: "bpf_cpu_time_ms",
+    FeatureGroup.BPFIRQ: "bpf_cpu_time_ms",
     FeatureGroup.CounterIRQCombined: "cpu_instructions",
     FeatureGroup.Basic: "cpu_instructions",
     FeatureGroup.AcceleratorOnly: "accelerator_intel_qat",

diff --git a/tests/data/prom_output/idle.json b/tests/data/prom_output/idle.json
diff --git a/tests/data/prom_output/prom_response.json b/tests/data/prom_output/prom_response.json