Skip to content

Commit

Permalink
Fix lib generation issue.
Browse files Browse the repository at this point in the history
  • Loading branch information
@r12f
r12f committed Dec 7, 2023
1 parent 735ae6b commit a605a93
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 15 deletions.
20 changes: 10 additions & 10 deletions dash-pipeline/SAI/sai_api_gen.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,6 @@ def parse_action_params(self, p4rt_table_action, sai_enums):
if 'v4_or_v6' in p4rt_table_action_param[NAME_TAG]:
v4_or_v6_param_name = p4rt_table_action_param[NAME_TAG]
v4_or_v6_param_ids[v4_or_v6_param_name] = p4rt_table_action_param['id']
break

# Parse all params.
for p in p4rt_table_action[PARAMS_TAG]:
Expand Down Expand Up @@ -462,26 +461,27 @@ def __init__(self):
self.actions = []
self.action_params = []
self.with_counters = 'false'

# Extra properties from annotations
self.stage = None
self.is_object = None

def parse_p4rt(self, p4rt_table, program, all_actions, ignore_tables):
table_control, self.name = p4rt_table[PREAMBLE_TAG][NAME_TAG].split('.', 1)
table_control, table_name = p4rt_table[PREAMBLE_TAG][NAME_TAG].split('.', 1)

self.__parse_sai_table_annotations(p4rt_table[PREAMBLE_TAG])
if self.ignored:
ignore_tables.append(self.name)
if self.name in ignore_tables:
ignore_tables.append(table_name)
if table_name in ignore_tables:
return

print("Parsing table: " + self.name)
print("Parsing table: " + table_name)

self.name, self.api_name = self.name.split('|')
if '.' in self.name:
self.name = self.name.split('.')[-1]
table_name, self.api_name = table_name.split('|')
self.name = table_name.split('.')[-1] if '.' in table_name else table_name

if ':' in self.name:
stage, group_name = self.name.split(':')
if ':' in table_name:
stage, group_name = table_name.split(':')
self.name = group_name
self.stage = stage.replace('.' , '_')

Expand Down
10 changes: 5 additions & 5 deletions dash-pipeline/SAI/templates/saiapi.cpp.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ static sai_status_t dash_sai_create_{{ table.name }}(
assert(mask && "SAI_{{ table.name | upper }}_ATTR_{{ key.sai_key_name | upper }}_MASK isn't provided");
{{key.field}}SetMask(mask->value, mf_ternary, {{key.bitwidth}});
{% endif %}
{% if key.v4_or_v6_id != None %}
{% if key.v4_or_v6_id != 0 %}
{
// set v4_or_v6 field
auto mf = matchActionEntry->add_match();
Expand Down Expand Up @@ -187,7 +187,7 @@ static sai_status_t dash_sai_create_{{ table.name }}(
param->set_param_id({{param.id}});
{{param.field}}SetVal(attr_list[i].value, param, {{param.bitwidth}});
//matchedParams++;
{% if param.v4_or_v6_id != None %}
{% if param.v4_or_v6_id != 0 %}
{
// set v4_or_v6 field
auto param2 = action->add_params();
Expand Down Expand Up @@ -364,7 +364,7 @@ static sai_status_t dash_sai_create_{{ table.name }}(
//{{key.field}}SetVal(attr_list[i].value, mf1_list, {{key.bitwidth}});
{% endif %}
}
{% if key.v4_or_v6_id != None %}
{% if key.v4_or_v6_id != 0 %}
{
// set v4_or_v6 field
auto mf = matchActionEntry->add_match();
Expand Down Expand Up @@ -422,7 +422,7 @@ static sai_status_t dash_sai_create_{{ table.name }}(
param->set_param_id({{param.id}});
{{param.field}}SetVal(attr_list[i].value, param, {{param.bitwidth}});
//matchedParams++;
{% if param.v4_or_v6_id != None %}
{% if param.v4_or_v6_id != 0 %}
{
// set v4_or_v6 field
auto param2 = action->add_params();
Expand Down Expand Up @@ -527,7 +527,7 @@ static sai_status_t dash_sai_remove_{{ table.name }}(
//{{key.field}}SetVal(attr_list[i].value, mf1_list, {{key.bitwidth}});
{% endif %}
}
{% if key.v4_or_v6_id != None %}
{% if key.v4_or_v6_id != 0 %}
{
// set v4_or_v6 field
auto mf = matchActionEntry->add_match();
Expand Down

0 comments on commit a605a93

Please sign in to comment.