Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

backend: (csl) Don't use CSL keywords as var names #3152

Merged
merged 1 commit into from
Sep 10, 2024
Merged

backend: (csl) Don't use CSL keywords as var names #3152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
86 changes: 86 additions & 0 deletions tests/filecheck/backend/csl/print_csl.mlir
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,50 @@
csl.return
}

csl.func @name_collisions() {
%align = arith.constant 0 : i32
%and = arith.constant 0 : i32
%bool = arith.constant 0 : i32
%break = arith.constant 0 : i32
%comptime_float = arith.constant 0 : i32
%comptime_int = arith.constant 0 : i32
%comptime_string = arith.constant 0 : i32
%comptime_struct = arith.constant 0 : i32
%const = arith.constant 0 : i32
%continue = arith.constant 0 : i32
%else = arith.constant 0 : i32
%export = arith.constant 0 : i32
%extern = arith.constant 0 : i32
%f16 = arith.constant 0 : i32
%f32 = arith.constant 0 : i32
%false = arith.constant 0 : i32
%fn = arith.constant 0 : i32
%for = arith.constant 0 : i32
%i16 = arith.constant 0 : i32
%i32 = arith.constant 0 : i32
%i64 = arith.constant 0 : i32
%i8 = arith.constant 0 : i32
%if = arith.constant 0 : i32
%linkname = arith.constant 0 : i32
%linksection = arith.constant 0 : i32
%or = arith.constant 0 : i32
%param = arith.constant 0 : i32
%return = arith.constant 0 : i32
%switch = arith.constant 0 : i32
%task = arith.constant 0 : i32
%true = arith.constant 0 : i32
%u16 = arith.constant 0 : i32
%u32 = arith.constant 0 : i32
%u64 = arith.constant 0 : i32
%u8 = arith.constant 0 : i32
%var = arith.constant 0 : i32
%void = arith.constant 0 : i32
%while = arith.constant 0 : i32


csl.return
}

csl.func @casts() {
%constI32 = arith.constant 0 : i32
%constU16 = arith.constant 0 : ui16
Expand Down Expand Up @@ -438,6 +482,48 @@ csl.func @builtins() {
// CHECK-NEXT: return;
// CHECK-NEXT: }
// CHECK-NEXT: {{ *}}
// CHECK-NEXT: fn name_collisions() void {
// CHECK-NEXT: const align0 : i32 = 0;
// CHECK-NEXT: const and1 : i32 = 0;
// CHECK-NEXT: const bool2 : i32 = 0;
// CHECK-NEXT: const break3 : i32 = 0;
// CHECK-NEXT: const comptime_float4 : i32 = 0;
// CHECK-NEXT: const comptime_int5 : i32 = 0;
// CHECK-NEXT: const comptime_string6 : i32 = 0;
// CHECK-NEXT: const comptime_struct7 : i32 = 0;
// CHECK-NEXT: const const8 : i32 = 0;
// CHECK-NEXT: const continue9 : i32 = 0;
// CHECK-NEXT: const else10 : i32 = 0;
// CHECK-NEXT: const export11 : i32 = 0;
// CHECK-NEXT: const extern12 : i32 = 0;
// CHECK-NEXT: const f1613 : i32 = 0;
// CHECK-NEXT: const f3214 : i32 = 0;
// CHECK-NEXT: const false15 : i32 = 0;
// CHECK-NEXT: const fn16 : i32 = 0;
// CHECK-NEXT: const for17 : i32 = 0;
// CHECK-NEXT: const i1618 : i32 = 0;
// CHECK-NEXT: const i3219 : i32 = 0;
// CHECK-NEXT: const i6420 : i32 = 0;
// CHECK-NEXT: const i821 : i32 = 0;
// CHECK-NEXT: const if22 : i32 = 0;
// CHECK-NEXT: const linkname23 : i32 = 0;
// CHECK-NEXT: const linksection24 : i32 = 0;
// CHECK-NEXT: const or25 : i32 = 0;
// CHECK-NEXT: const param26 : i32 = 0;
// CHECK-NEXT: const return27 : i32 = 0;
// CHECK-NEXT: const switch28 : i32 = 0;
// CHECK-NEXT: const task29 : i32 = 0;
// CHECK-NEXT: const true30 : i32 = 0;
// CHECK-NEXT: const u1631 : i32 = 0;
// CHECK-NEXT: const u3232 : i32 = 0;
// CHECK-NEXT: const u6433 : i32 = 0;
// CHECK-NEXT: const u834 : i32 = 0;
// CHECK-NEXT: const var35 : i32 = 0;
// CHECK-NEXT: const void36 : i32 = 0;
// CHECK-NEXT: const while37 : i32 = 0;
// CHECK-NEXT: return;
// CHECK-NEXT: }
// CHECK-NEXT: {{ *}}
// CHECK-NEXT: fn casts() void {
// CHECK-NEXT: const castIndex : i32 = @as(i32, 0);
// CHECK-NEXT: const castF32 : f32 = @as(f32, @as(f16, 0));
Expand Down
50 changes: 49 additions & 1 deletion xdsl/backend/csl/print_csl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,54 @@
from xdsl.traits import is_side_effect_free
from xdsl.utils.hints import isa

_CSL_KW_SET = {
"align",
"and",
"bool",
"break",
"comptime_float",
"comptime_int",
"comptime_string",
"comptime_struct",
"const",
"continue",
"else",
"export",
"extern",
"f16",
"f32",
"false",
"fn",
"for",
"i16",
"i32",
"i64",
"i8",
"if",
"linkname",
"linksection",
"or",
"param",
"return",
"switch",
"task",
"true",
"u16",
"u32",
"u64",
"u8",
"var",
"void",
"while",
}
"""
The set of CSL language keywords. These should not be used as variable names.

There is no official list of all reserved keywords in CSL, this list was
compiled using the keywords found here: https://sdk.cerebras.net/csl/language/syntax
and should be expanded as needed.
"""


@dataclass
class CslPrintContext:
Expand Down Expand Up @@ -261,7 +309,7 @@ def _get_variable_name_for(self, val: SSAValue, hint: str | None = None) -> str:
if val in self.variables:
return self.variables[val]

taken_names = set(self.variables.values())
taken_names = set(self.variables.values()) | _CSL_KW_SET

if hint is None:
hint = val.name_hint
Expand Down
Loading