Addressed review comments.

Signed-off-by: L Lakshmanan <s2760012@ed.ac.uk>

Author: KarthikL1729

.github/workflows/tools-tests.yaml

@@ -64,18 +64,19 @@ jobs:
 
       - name: Profile load check
         run: |
-          tar -xzvf tools/mapper/profile.tar.gz -C tools/mapper/
+          gzip -d tools/mapper/profile.json.gz -c > tools/mapper/profile.json
           python3 -c "import json; json.load(open('tools/mapper/profile.json'))"
   
       - name: Test traces load check
         run: |
-          tar -xzvf tools/mapper/test_files/trace.tar.gz -C tools/mapper/test_files/
           python3 tools/mapper/trace_load_test.py -t tools/mapper/test_files/extremes/
 
       - name: Extreme mapping tests
         run: |
           python3 tools/mapper/mapper.py -t tools/mapper/test_files/extremes -p tools/mapper/profile.json
+          diff tools/mapper/test_files/extremes/mapper_output.json tools/mapper/test_files/extremes/correct_mapper_output.json
 
-      - name: Run mapper tool on sample trace
+      - name: Run mapper tool on example trace
         run: |
-          python3 tools/mapper/mapper.py -t tools/mapper/test_files/20 -p tools/mapper/profile.json
+          python3 tools/mapper/mapper.py -t data/traces/example -p tools/mapper/profile.json
+          diff data/traces/example/mapper_output.json data/traces/example/correct_mapper_output.json

data/traces/example/correct_mapper_output.json

@@ -0,0 +1,14 @@
+{
+    "c13acdc7567b225971cef2416a3a2b03c8a4d8d154df48afe75834e2f5c59ddfc455703077a17a9b8d0fc655d939fcc6d24d819fa9a1066b74f710c35a43cbc868baea05aa0c3619b6feb78c80a07e27e4e68f921d714b8125f916c3b3370bf2": {
+        "proxy-function": "video-processing-python-10"
+    },
+    "a2faad786b3c813b12ce57d349d5e62f6d0f22ceecfa86cd72a962853383b600d7028b01f2422ea9d4f695cae4085800eb34540674081a46bb4e4388e7995f7ac8b8b9160f181010f509ee0af3266cbcb5a5f4c7700ba8d4396f1147e1ad3bbd": {
+        "proxy-function": "image-rotate-go-11"
+    },
+    "7dc5aeabc131669912e8c793c8925cc9928321f45f13a4af031592b4611630d70728f480194febeddbc0d2a69a2cb38344e495f264d52c62102e7bd99505dbf22cc1c836a3b32265b4a36b6e6f56b2d7c0588a926df5d03a76b7b4388cbf2258": {
+        "proxy-function": "video-processing-python-100"
+    },
+    "ae8a1640fa932024f59b38a0b001808b5c64612bd60c6f3eb80ba9461ba2d09101d1a13d091b0cfc764a125ead054ad6a720cb29b0b1fc2c187e9be3311f09fe90ba6ab2b1b9f5b5925d1e9ee6242d0f840ebcfb3221567bc2b5f24cb864b016": {
+        "proxy-function": "video-processing-python-10"
+    }
+}

tools/mapper/.gitattributes

@@ -58,24 +58,29 @@ def get_closest_proxy_function(
         proxy_list.append(proxy_functions[function_name])
         proxy_functions[function_name]["index"] = len(proxy_list) - 1
 
-    for function_name in trace_functions:
+    for id in trace_functions:
         min_error = math.inf
         min_error_index = -1
         for i in range(0, len(proxy_list)):
-            error = get_error(trace_functions[function_name], proxy_list[i])
+            error = get_error(trace_functions[id], proxy_list[i])
             if error < min_error:
                 min_error = error
                 min_error_index = i
 
         if min_error == math.inf:
-            log.warning(f"Proxy function for function {function_name} not found. Using InVitro trace function.")
-            trace_functions[function_name]["proxy-function"] = "trace-func-go"
+            log.warning(f"Proxy function for unique id (HashFunction + HashOwner + HashApp) {id} not found. Using InVitro trace function.")
+            trace_functions[id]["proxy-function"] = "trace-func-go"
             continue
 
-        trace_functions[function_name]["proxy-function"] = proxy_list[
+        trace_functions[id]["proxy-function"] = proxy_list[
             min_error_index
         ]["name"]
 
+        if abs(trace_functions[id]["duration"]["50-percentile"] - proxy_functions[trace_functions[id]["proxy-function"]]["duration"]["50-percentile"]) > 0.4*trace_functions[id]["duration"]["50-percentile"]:
+            log.warning(f"Duration error for id {id} above 40%. Using InVitro trace function.")
+            trace_functions[id]["proxy-function"] = "trace-func-go"
+            continue
+
     for function_name in proxy_functions:
         del proxy_functions[function_name]["index"]
 

tools/mapper/find_proxy_function.py

@@ -55,52 +55,16 @@ def load_trace(trace_directorypath):
     trace_functions = {}
 
     for _, row in duration_info.iterrows():
-        hash_function = row["HashFunction"]
-        trace_functions[hash_function] = {}
-        trace_functions[hash_function]["duration"] = row
+        unique_id = row["HashFunction"] + row["HashOwner"] + row["HashApp"]
+        trace_functions[unique_id] = {}
+        trace_functions[unique_id]["duration"] = row
 
     for _, row in memory_info.iterrows():
-        hash_function = row["HashFunction"]
-        trace_functions[hash_function]["memory"] = row
+        unique_id = row["HashFunction"] + row["HashOwner"] + row["HashApp"]
+        trace_functions[unique_id]["memory"] = row
 
     return trace_functions, 0
 
-def generate_plot(trace_directorypath, trace_functions, proxy_functions, mapped_trace, invocation_statistics=True):
-    
-    if invocation_statistics:
-        invocations = pd.read_csv(trace_directorypath+"/invocations.csv")
-        inv_df = {}
-        for i in range(len(invocations)):
-            inv_df[invocations["HashFunction"][i]] = sum([invocations[col][i] if col not in invocations.columns[0:INVOCATION_COLUMN] else 0 for col in invocations.columns])
-        
-        trace_durations = []
-        mapped_durations = []
-        dropped_functions, dropped_invocations, total_invocations = 0, 0, 0
-        for trace in trace_functions:
-            duration = trace_functions[trace]["duration"]["50-percentile"]
-            if duration > VSWARM_MAX_DUR:
-                dropped_functions += 1
-                dropped_invocations += inv_df[trace]
-                continue
-            total_invocations += inv_df[trace]
-            proxy_name = mapped_trace[trace]["proxy-function"]
-            profile_duration = proxy_functions[proxy_name]["duration"]["50-percentile"]
-            trace_durations.append(duration)
-            mapped_durations.append(profile_duration)
-        return trace_durations, mapped_durations, dropped_functions, (dropped_invocations/total_invocations)*100
-    else:
-        trace_durations = []
-        mapped_durations = []
-        for trace in trace_functions:
-            duration = trace_functions[trace]["duration"]["50-percentile"]
-            if duration > VSWARM_MAX_DUR:
-                continue
-            proxy_name = mapped_trace[trace]["proxy-function"]
-            profile_duration = proxy_functions[proxy_name]["duration"]["50-percentile"]
-            trace_durations.append(duration)
-            mapped_durations.append(profile_duration)
-        return trace_durations, mapped_durations
-
 def main():
     # Parse the arguments
     parser = argparse.ArgumentParser(description="Mapper")
@@ -160,9 +124,9 @@ def main():
 
     # Only give function name and proxy name
     trace_json = {}
-    for function in trace_functions:
-        trace_json[function] = {}
-        trace_json[function]["proxy-function"] = trace_functions[function]["proxy-function"] 
+    for id in trace_functions:
+        trace_json[id] = {}
+        trace_json[id]["proxy-function"] = trace_functions[id]["proxy-function"] 
 
     try:
         with open(output_filepath, "w") as jf:
@@ -173,15 +137,7 @@ def main():
         return
 
     log.info(f"Output file {output_filepath} written")
-    log.info(f"Preliminary load Generation successful. Checking error levels in mapping...")
-
-    # Read the mapper output
-    try:
-        with open(output_filepath, "r") as jf:
-            mapper_output = json.load(jf)
-    except Exception as e:
-        log.critical(f"Error in loading mapper output file {e}")
-        return
+    log.info(f"Load Generation successful. Mapper output generated.")
 
     # Check the memory and duration errors
 
@@ -195,11 +151,14 @@ def main():
     abs_rel_mem_error = 0
     abs_rel_dur_error = 0
     zero_duration = 0
-    for function in mapper_output:
-        trace_mem = trace_functions[function]["memory"]["50-percentile"]
-        trace_dur = trace_functions[function]["duration"]["50-percentile"]
-        proxy_dur = proxy_functions[mapper_output[function]["proxy-function"]]["duration"]["50-percentile"]
-        proxy_mem = proxy_functions[mapper_output[function]["proxy-function"]]["memory"]["50-percentile"]
+    for id in trace_functions:
+        if trace_functions[id]["proxy-function"] == "trace-func-go":
+            dur_count += 1
+            continue
+        trace_mem = trace_functions[id]["memory"]["50-percentile"]
+        trace_dur = trace_functions[id]["duration"]["50-percentile"]
+        proxy_dur = proxy_functions[trace_functions[id]["proxy-function"]]["duration"]["50-percentile"]
+        proxy_mem = proxy_functions[trace_functions[id]["proxy-function"]]["memory"]["50-percentile"]
         mem_error += trace_mem - proxy_mem
         rel_mem_error += (trace_mem - proxy_mem)/trace_mem
         abs_mem_error += abs(trace_mem - proxy_mem)
@@ -211,11 +170,8 @@ def main():
         else:
             rel_dur_error += (trace_dur - proxy_dur)/trace_dur
             abs_rel_dur_error += abs((trace_dur - proxy_dur)/trace_dur)
-        if abs(trace_dur - proxy_dur) > 0.4*trace_dur:
-            mapper_output[function]["proxy-function"] = "trace-func-go"
-            dur_count += 1
 
-    total_functions = len(mapper_output)
+    total_functions = len(trace_functions)
     log.info(f"Average memory error: {mem_error/total_functions} MB per invocation")
     log.info(f"Average duration error: {dur_error/total_functions} ms per invocation")
     log.info(f"Average absolute memory error: {abs_mem_error/total_functions} MB per invocation")
@@ -227,18 +183,5 @@ def main():
     log.info(f"Duration errors: {dur_count}")
     log.info(f"Functions with 0 duration: {zero_duration}")
 
-    log.info(f"Replacing the functions with high duration error with invitro functions.")
-
-    ## Write the updated mapper output
-
-    try:
-        with open(output_filepath, "w") as jf:
-            json.dump(mapper_output, jf, indent=4)
-            log.info(f"Updated output file {output_filepath} written. Load generated.")
-    except Exception as e:
-        log.critical(f"Output file {output_filepath} cannot be written. Error: {e}")
-        log.critical(f"Load Generation failed")
-        return
-
 if __name__ == "__main__":
     main()