Compare commits

...

2 Commits

Author SHA1 Message Date
61a451b82d fix counting issue in ram bits 2025-06-11 04:47:35 +00:00
c73de36c70 replace classes with class string instead of index 2025-06-11 04:41:32 +00:00
3 changed files with 42 additions and 59 deletions

File diff suppressed because one or more lines are too long

View File

@@ -38,14 +38,14 @@
"i = 0\n", "i = 0\n",
"\n", "\n",
"path_ids = set()\n", "path_ids = set()\n",
"path_classes = set()\n", "path_classes = tree[\"classes\"]\n",
"\n", "\n",
"# for each path in the tree\n", "# for each path in the tree\n",
"for path in paths:\n", "for path in paths:\n",
"\t# assign a path id \n", "\t# assign a path id \n",
"\tpath[\"id\"] = i\n", "\tpath[\"id\"] = i\n",
"\tpath_ids.add(i)\n", "\tpath_ids.add(i)\n",
"\tpath_classes.add(path[\"classification\"])\n", "\t#path_classes.add(path[\"classification\"])\n",
"\ti += 1\t\n", "\ti += 1\t\n",
"\t# for each condition\n", "\t# for each condition\n",
"\tconditions = path[\"conditions\"]\n", "\tconditions = path[\"conditions\"]\n",
@@ -86,41 +86,7 @@
"execution_count": 5, "execution_count": 5,
"id": "98cde024", "id": "98cde024",
"metadata": {}, "metadata": {},
"outputs": [ "outputs": [],
{
"name": "stdout",
"output_type": "stream",
"text": [
"{'dst': {'min': None, 'max': 578}, 'src': {'min': None, 'max': 60}, 'protocl': {'min': None, 'max': 0}}\n",
"{'dst': {'min': None, 'max': 3031}, 'src': {'min': None, 'max': 60}, 'protocl': {'min': None, 'max': 0}}\n",
"{'dst': {'min': None, 'max': 3031}, 'src': {'min': None, 'max': 60}, 'protocl': {'min': 0, 'max': None}}\n",
"{'dst': {'min': None, 'max': 3031}, 'src': {'min': None, 'max': 60}, 'protocl': {'min': 1, 'max': None}}\n",
"{'dst': {'min': None, 'max': 3031}, 'src': {'min': None, 'max': 67}, 'protocl': {'min': None, 'max': None}}\n",
"{'dst': {'min': None, 'max': 101}, 'src': {'min': 67, 'max': None}, 'protocl': {'min': None, 'max': None}}\n",
"{'dst': {'min': None, 'max': 101}, 'src': {'min': 54978, 'max': None}, 'protocl': {'min': None, 'max': None}}\n",
"{'dst': {'min': None, 'max': 101}, 'src': {'min': 59817, 'max': None}, 'protocl': {'min': None, 'max': None}}\n",
"{'dst': {'min': None, 'max': 101}, 'src': {'min': 60043, 'max': None}, 'protocl': {'min': None, 'max': None}}\n",
"{'dst': {'min': None, 'max': 3031}, 'src': {'min': 67, 'max': None}, 'protocl': {'min': None, 'max': None}}\n",
"{'dst': {'min': None, 'max': 3031}, 'src': {'min': 130, 'max': None}, 'protocl': {'min': None, 'max': None}}\n",
"{'dst': {'min': None, 'max': 3031}, 'src': {'min': 1223, 'max': None}, 'protocl': {'min': None, 'max': None}}\n",
"{'dst': {'min': 3031, 'max': None}, 'src': {'min': None, 'max': None}, 'protocl': {'min': None, 'max': None}}\n",
"{'dst': {'min': 3067, 'max': None}, 'src': {'min': None, 'max': None}, 'protocl': {'min': None, 'max': None}}\n",
"{'dst': {'min': 5110, 'max': None}, 'src': {'min': None, 'max': None}, 'protocl': {'min': None, 'max': None}}\n",
"{'dst': {'min': 33925, 'max': None}, 'src': {'min': None, 'max': None}, 'protocl': {'min': None, 'max': None}}\n",
"{'dst': {'min': 46329, 'max': None}, 'src': {'min': None, 'max': None}, 'protocl': {'min': None, 'max': None}}\n",
"{'dst': {'min': 46331, 'max': None}, 'src': {'min': None, 'max': None}, 'protocl': {'min': None, 'max': None}}\n",
"{'dst': {'min': 49152, 'max': None}, 'src': {'min': None, 'max': None}, 'protocl': {'min': None, 'max': None}}\n",
"{'dst': {'min': 49157, 'max': None}, 'src': {'min': None, 'max': 283}, 'protocl': {'min': None, 'max': 11}}\n",
"{'dst': {'min': 49157, 'max': None}, 'src': {'min': None, 'max': 283}, 'protocl': {'min': 11, 'max': None}}\n",
"{'dst': {'min': 49157, 'max': None}, 'src': {'min': None, 'max': 4566}, 'protocl': {'min': None, 'max': None}}\n",
"{'dst': {'min': 56320, 'max': None}, 'src': {'min': None, 'max': 4566}, 'protocl': {'min': None, 'max': None}}\n",
"{'dst': {'min': 49157, 'max': None}, 'src': {'min': 4566, 'max': None}, 'protocl': {'min': None, 'max': None}}\n",
"{'dst': {'min': 51848, 'max': None}, 'src': {'min': 4566, 'max': None}, 'protocl': {'min': None, 'max': None}}\n",
"{'dst': {'min': 49157, 'max': None}, 'src': {'min': 5225, 'max': None}, 'protocl': {'min': None, 'max': None}}\n",
"{'dst': {'min': 53283, 'max': None}, 'src': {'min': 5225, 'max': None}, 'protocl': {'min': None, 'max': None}}\n"
]
}
],
"source": [ "source": [
"# collapse all paths to ranges for each feature\n", "# collapse all paths to ranges for each feature\n",
"# because of how decision trees work, all conditions on a path must be true to reach the leaf node\n", "# because of how decision trees work, all conditions on a path must be true to reach the leaf node\n",
@@ -152,8 +118,7 @@
"\t\telif operation == \">\" and value > compressed[feature][\"max\"]:\n", "\t\telif operation == \">\" and value > compressed[feature][\"max\"]:\n",
"\t\t\tcompressed[feature][\"min\"] = value\n", "\t\t\tcompressed[feature][\"min\"] = value\n",
"\n", "\n",
"\tpath[\"compressed\"] = compressed\n", "\tpath[\"compressed\"] = compressed"
"\tprint(compressed)"
] ]
}, },
{ {

View File

@@ -77,7 +77,7 @@
"\t\t}\n", "\t\t}\n",
"\t\ttcam_bits += num_prefixes * prefix_width\n", "\t\ttcam_bits += num_prefixes * prefix_width\n",
"\n", "\n",
"\t\t# assume no pointer reuse for metadata storage\n", "\t\t# assume basic pointer reuse for metadata storage\n",
"\t\tram = {\n", "\t\tram = {\n",
"\t\t\t\"id\": f\"{layer}_meta\",\n", "\t\t\t\"id\": f\"{layer}_meta\",\n",
"\t\t\t\"step\": step,\n", "\t\t\t\"step\": step,\n",
@@ -86,7 +86,7 @@
"\t\t\t\"key_size\": math.ceil(math.log2(num_ranges)),\n", "\t\t\t\"key_size\": math.ceil(math.log2(num_ranges)),\n",
"\t\t\t\"data_size\": len(classes)\n", "\t\t\t\"data_size\": len(classes)\n",
"\t\t}\n", "\t\t}\n",
"\t\tram_bits += math.ceil(math.log2(num_ranges)) * len(classes)\n", "\t\tram_bits += num_ranges * len(classes)\n",
"\n", "\n",
"\t\trmt.append(tcam)\n", "\t\trmt.append(tcam)\n",
"\t\trmt.append(ram)\n", "\t\trmt.append(ram)\n",
@@ -118,7 +118,7 @@
"id mapping: \n", "id mapping: \n",
"[['dst_range', 'dst_meta'], ['src_range', 'src_meta'], ['protocl_range', 'protocl_meta'], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], []]\n", "[['dst_range', 'dst_meta'], ['src_range', 'src_meta'], ['protocl_range', 'protocl_meta'], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], []]\n",
"TCAM bits: 13312\n", "TCAM bits: 13312\n",
"RAM bits: 110\n" "RAM bits: 522\n"
] ]
} }
], ],
@@ -182,9 +182,7 @@
"\t\t\tmerge(prefix, prefixes)\n", "\t\t\tmerge(prefix, prefixes)\n",
"\t\telse:\n", "\t\telse:\n",
"\t\t\tprefixes.append(prefix)\n", "\t\t\tprefixes.append(prefix)\n",
"\treturn prefixes\n", "\treturn prefixes"
"\n",
"#convert_range(81, 1024, 16)"
] ]
}, },
{ {
@@ -234,7 +232,7 @@
"\t\t\t\"key_size\": math.ceil(math.log2(num_ranges)),\n", "\t\t\t\"key_size\": math.ceil(math.log2(num_ranges)),\n",
"\t\t\t\"data_size\": len(classes)\n", "\t\t\t\"data_size\": len(classes)\n",
"\t\t}\n", "\t\t}\n",
"\t\tram_bits += math.ceil(math.log2(num_ranges)) * len(classes)\n", "\t\tram_bits += num_ranges * len(classes)\n",
"\n", "\n",
"\t\trmt.append(tcam)\n", "\t\trmt.append(tcam)\n",
"\t\trmt.append(ram)\n", "\t\trmt.append(ram)\n",
@@ -265,8 +263,8 @@
"[1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]\n", "[1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]\n",
"id mapping: \n", "id mapping: \n",
"[['dst_range', 'dst_meta'], ['src_range', 'src_meta'], ['protocl_range', 'protocl_meta'], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], []]\n", "[['dst_range', 'dst_meta'], ['src_range', 'src_meta'], ['protocl_range', 'protocl_meta'], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], []]\n",
"TCAM bits: 3520\n", "TCAM bits: 3584\n",
"RAM bits: 110\n" "RAM bits: 522\n"
] ]
} }
], ],
@@ -339,7 +337,7 @@
"\t\t\t\"key_size\": math.ceil(math.log2(num_ranges)),\n", "\t\t\t\"key_size\": math.ceil(math.log2(num_ranges)),\n",
"\t\t\t\"data_size\": len(classes)\n", "\t\t\t\"data_size\": len(classes)\n",
"\t\t}\n", "\t\t}\n",
"\t\tram_bits += math.ceil(math.log2(num_ranges)) * len(classes)\n", "\t\tram_bits += num_ranges * len(classes)\n",
"\n", "\n",
"\t\trmt.append(tcam)\n", "\t\trmt.append(tcam)\n",
"\t\trmt.append(ram)\n", "\t\trmt.append(ram)\n",
@@ -371,7 +369,7 @@
"id mapping: \n", "id mapping: \n",
"[['dst_range', 'dst_meta'], ['src_range', 'src_meta'], ['protocl_range', 'protocl_meta'], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], []]\n", "[['dst_range', 'dst_meta'], ['src_range', 'src_meta'], ['protocl_range', 'protocl_meta'], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], []]\n",
"TCAM bits: 2120\n", "TCAM bits: 2120\n",
"RAM bits: 110\n" "RAM bits: 522\n"
] ]
} }
], ],