Skip to content

Commit 0f9cf82

Browse files
alaindargelasalaindargelas
authored
Merge pull request #3700 from alainmarcel/alainmarcel-patch-1
partial operation reduction
2 parents 7689edf + 243018e commit 0f9cf82

File tree

19 files changed

+628
-395
lines changed

19 files changed

+628
-395
lines changed

‎.vscode/launch.json‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1914,6 +1914,25 @@
19141914
"ignoreFailures": true
19151915
}
19161916
]
1917+
},
1918+
{
1919+
"name": "Compl1001",
1920+
"type": "cppdbg",
1921+
"request": "launch",
1922+
"program": "${workspaceFolder}/dbuild/bin/surelog",
1923+
"args": ["-f", "Compl1001.sl"],
1924+
"stopAtEntry": false,
1925+
"cwd": "${workspaceFolder}/third_party/tests/Compl1001",
1926+
"environment": [],
1927+
"externalConsole": false,
1928+
"MIMode": "gdb",
1929+
"setupCommands": [
1930+
{
1931+
"description": "Enable pretty-printing for gdb",
1932+
"text": "-enable-pretty-printing",
1933+
"ignoreFailures": true
1934+
}
1935+
]
19171936
}
19181937
]
19191938
}

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ cmake_minimum_required(VERSION 3.20 FATAL_ERROR)
55
# Version changes whenever some new features accumulated, or the
66
# grammar or the cache format changes to make sure caches
77
# are invalidated.
8-
project(SURELOG VERSION 1.62)
8+
project(SURELOG VERSION 1.63)
99

1010
# Detect build type, fallback to release and throw a warning if use didn't
1111
# specify any

‎src/DesignCompile/Elaboration_test.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1399,7 +1399,7 @@ TEST(Elaboration, ConstantPush) {
13991399
std::tie(design, fC, compileDesign) = eharness.elaborate(R"(
14001400
module top;
14011401
logic [63:0] s1c;
1402-
assign s1c = ('1 << 8);
1402+
assign s1c = ('1 << 8) + 1;
14031403
endmodule
14041404
)");
14051405
Compiler* compiler = compileDesign->getCompiler();
@@ -1413,7 +1413,7 @@ endmodule
14131413
UHDM::ExprEval eval;
14141414
int64_t val = eval.get_value(invalidValue, rhs);
14151415
if (name == "s1c") {
1416-
EXPECT_EQ(val, (ULLONG_MAX << 8));
1416+
EXPECT_EQ(val, ((ULLONG_MAX << 8) + 1));
14171417
}
14181418
}
14191419
}

‎tests/ArianeElab/ArianeElab.log‎

Lines changed: 15 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -110871,30 +110871,11 @@ design: (work@top)
110871110871
\_operation: , line:855:47, endln:855:78
110872110872
|vpiOpType:34
110873110873
|vpiOperand:
110874-
\_operation: , line:855:49, endln:855:63
110875-
|vpiParent:
110876-
\_operation: , line:855:48, endln:855:70
110877-
|vpiOpType:11
110878-
|vpiOperand:
110879-
\_constant: , line:855:49, endln:855:56
110880-
|vpiParent:
110881-
\_operation: , line:855:49, endln:855:63
110882-
|vpiDecompile:64
110883-
|vpiSize:32
110884-
|UINT:64
110885-
|vpiTypespec:
110886-
\_int_typespec:
110887-
|vpiParent:
110888-
\_constant: , line:855:49, endln:855:56
110889-
|vpiConstType:9
110890-
|vpiOperand:
110891-
\_constant: , line:855:61, endln:855:63
110892-
|vpiParent:
110893-
\_operation: , line:855:49, endln:855:63
110894-
|vpiDecompile:32
110895-
|vpiSize:64
110896-
|UINT:32
110897-
|vpiConstType:9
110874+
\_constant: , line:855:48, endln:855:70
110875+
|vpiDecompile:32
110876+
|vpiSize:64
110877+
|INT:32
110878+
|vpiConstType:7
110898110879
|vpiOperand:
110899110880
\_operation: , line:855:63, endln:855:69
110900110881
|vpiParent:
@@ -118981,30 +118962,11 @@ design: (work@top)
118981118962
\_operation: , line:855:47, endln:855:78
118982118963
|vpiOpType:34
118983118964
|vpiOperand:
118984-
\_operation: , line:855:49, endln:855:63
118985-
|vpiParent:
118986-
\_operation: , line:855:48, endln:855:70
118987-
|vpiOpType:11
118988-
|vpiOperand:
118989-
\_constant: , line:855:49, endln:855:56
118990-
|vpiParent:
118991-
\_operation: , line:855:49, endln:855:63
118992-
|vpiDecompile:64
118993-
|vpiSize:32
118994-
|UINT:64
118995-
|vpiTypespec:
118996-
\_int_typespec:
118997-
|vpiParent:
118998-
\_constant: , line:855:49, endln:855:56
118999-
|vpiConstType:9
119000-
|vpiOperand:
119001-
\_constant: , line:855:61, endln:855:63
119002-
|vpiParent:
119003-
\_operation: , line:855:49, endln:855:63
119004-
|vpiDecompile:32
119005-
|vpiSize:64
119006-
|UINT:32
119007-
|vpiConstType:9
118965+
\_constant: , line:855:48, endln:855:70
118966+
|vpiDecompile:32
118967+
|vpiSize:64
118968+
|INT:32
118969+
|vpiConstType:7
119008118970
|vpiOperand:
119009118971
\_operation: , line:855:63, endln:855:69
119010118972
|vpiParent:
@@ -126669,30 +126631,11 @@ design: (work@top)
126669126631
\_operation: , line:855:47, endln:855:78
126670126632
|vpiOpType:34
126671126633
|vpiOperand:
126672-
\_operation: , line:855:49, endln:855:63
126673-
|vpiParent:
126674-
\_operation: , line:855:48, endln:855:70
126675-
|vpiOpType:11
126676-
|vpiOperand:
126677-
\_constant: , line:855:49, endln:855:56
126678-
|vpiParent:
126679-
\_operation: , line:855:49, endln:855:63
126680-
|vpiDecompile:64
126681-
|vpiSize:32
126682-
|UINT:64
126683-
|vpiTypespec:
126684-
\_int_typespec:
126685-
|vpiParent:
126686-
\_constant: , line:855:49, endln:855:56
126687-
|vpiConstType:9
126688-
|vpiOperand:
126689-
\_constant: , line:855:61, endln:855:63
126690-
|vpiParent:
126691-
\_operation: , line:855:49, endln:855:63
126692-
|vpiDecompile:32
126693-
|vpiSize:64
126694-
|UINT:32
126695-
|vpiConstType:9
126634+
\_constant: , line:855:48, endln:855:70
126635+
|vpiDecompile:32
126636+
|vpiSize:64
126637+
|INT:32
126638+
|vpiConstType:7
126696126639
|vpiOperand:
126697126640
\_operation: , line:855:63, endln:855:69
126698126641
|vpiParent:

‎tests/ArianeElab2/ArianeElab2.log‎

Lines changed: 15 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -112094,30 +112094,11 @@ design: (work@top)
112094112094
\_operation: , line:855:47, endln:855:78
112095112095
|vpiOpType:34
112096112096
|vpiOperand:
112097-
\_operation: , line:855:49, endln:855:63
112098-
|vpiParent:
112099-
\_operation: , line:855:48, endln:855:70
112100-
|vpiOpType:11
112101-
|vpiOperand:
112102-
\_constant: , line:855:49, endln:855:56
112103-
|vpiParent:
112104-
\_operation: , line:855:49, endln:855:63
112105-
|vpiDecompile:64
112106-
|vpiSize:32
112107-
|UINT:64
112108-
|vpiTypespec:
112109-
\_int_typespec:
112110-
|vpiParent:
112111-
\_constant: , line:855:49, endln:855:56
112112-
|vpiConstType:9
112113-
|vpiOperand:
112114-
\_constant: , line:855:61, endln:855:63
112115-
|vpiParent:
112116-
\_operation: , line:855:49, endln:855:63
112117-
|vpiDecompile:32
112118-
|vpiSize:64
112119-
|UINT:32
112120-
|vpiConstType:9
112097+
\_constant: , line:855:48, endln:855:70
112098+
|vpiDecompile:32
112099+
|vpiSize:64
112100+
|INT:32
112101+
|vpiConstType:7
112121112102
|vpiOperand:
112122112103
\_operation: , line:855:63, endln:855:69
112123112104
|vpiParent:
@@ -120204,30 +120185,11 @@ design: (work@top)
120204120185
\_operation: , line:855:47, endln:855:78
120205120186
|vpiOpType:34
120206120187
|vpiOperand:
120207-
\_operation: , line:855:49, endln:855:63
120208-
|vpiParent:
120209-
\_operation: , line:855:48, endln:855:70
120210-
|vpiOpType:11
120211-
|vpiOperand:
120212-
\_constant: , line:855:49, endln:855:56
120213-
|vpiParent:
120214-
\_operation: , line:855:49, endln:855:63
120215-
|vpiDecompile:64
120216-
|vpiSize:32
120217-
|UINT:64
120218-
|vpiTypespec:
120219-
\_int_typespec:
120220-
|vpiParent:
120221-
\_constant: , line:855:49, endln:855:56
120222-
|vpiConstType:9
120223-
|vpiOperand:
120224-
\_constant: , line:855:61, endln:855:63
120225-
|vpiParent:
120226-
\_operation: , line:855:49, endln:855:63
120227-
|vpiDecompile:32
120228-
|vpiSize:64
120229-
|UINT:32
120230-
|vpiConstType:9
120188+
\_constant: , line:855:48, endln:855:70
120189+
|vpiDecompile:32
120190+
|vpiSize:64
120191+
|INT:32
120192+
|vpiConstType:7
120231120193
|vpiOperand:
120232120194
\_operation: , line:855:63, endln:855:69
120233120195
|vpiParent:
@@ -127892,30 +127854,11 @@ design: (work@top)
127892127854
\_operation: , line:855:47, endln:855:78
127893127855
|vpiOpType:34
127894127856
|vpiOperand:
127895-
\_operation: , line:855:49, endln:855:63
127896-
|vpiParent:
127897-
\_operation: , line:855:48, endln:855:70
127898-
|vpiOpType:11
127899-
|vpiOperand:
127900-
\_constant: , line:855:49, endln:855:56
127901-
|vpiParent:
127902-
\_operation: , line:855:49, endln:855:63
127903-
|vpiDecompile:64
127904-
|vpiSize:32
127905-
|UINT:64
127906-
|vpiTypespec:
127907-
\_int_typespec:
127908-
|vpiParent:
127909-
\_constant: , line:855:49, endln:855:56
127910-
|vpiConstType:9
127911-
|vpiOperand:
127912-
\_constant: , line:855:61, endln:855:63
127913-
|vpiParent:
127914-
\_operation: , line:855:49, endln:855:63
127915-
|vpiDecompile:32
127916-
|vpiSize:64
127917-
|UINT:32
127918-
|vpiConstType:9
127857+
\_constant: , line:855:48, endln:855:70
127858+
|vpiDecompile:32
127859+
|vpiSize:64
127860+
|INT:32
127861+
|vpiConstType:7
127919127862
|vpiOperand:
127920127863
\_operation: , line:855:63, endln:855:69
127921127864
|vpiParent:

‎tests/BlackConst/BlackConst.log‎

Lines changed: 10 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -3597,81 +3597,11 @@ design: (work@top)
35973597
\_operation: , line:10:4, endln:10:168
35983598
|vpiOpType:34
35993599
|vpiOperand:
3600-
\_operation: , line:10:7, endln:10:74
3601-
|vpiParent:
3602-
\_operation: , line:10:5, endln:10:93
3603-
|vpiOpType:32
3604-
|vpiOperand:
3605-
\_operation: , line:10:8, endln:10:38
3606-
|vpiParent:
3607-
\_operation: , line:10:7, endln:10:74
3608-
|vpiOpType:18
3609-
|vpiOperand:
3610-
\_operation: , line:10:9, endln:10:33
3611-
|vpiParent:
3612-
\_operation: , line:10:8, endln:10:38
3613-
|vpiOpType:11
3614-
|vpiOperand:
3615-
\_constant: , line:10:9, endln:10:23
3616-
|vpiParent:
3617-
\_operation: , line:10:9, endln:10:33
3618-
|vpiDecompile:48
3619-
|vpiSize:32
3620-
|UINT:48
3621-
|vpiTypespec:
3622-
\_int_typespec:
3623-
|vpiParent:
3624-
\_constant: , line:10:9, endln:10:23
3625-
|vpiConstType:9
3626-
|vpiOperand:
3627-
\_constant: , line:10:24, endln:10:33
3628-
|vpiParent:
3629-
\_operation: , line:10:9, endln:10:33
3630-
|vpiDecompile:13
3631-
|vpiSize:64
3632-
|UINT:13
3633-
|vpiConstType:9
3634-
|vpiOperand:
3635-
\_constant: , line:10:36, endln:10:37
3636-
|vpiParent:
3637-
\_operation: , line:10:8, endln:10:38
3638-
|vpiDecompile:0
3639-
|vpiSize:64
3640-
|UINT:0
3641-
|vpiConstType:9
3642-
|vpiOperand:
3643-
\_operation: , line:10:43, endln:10:67
3644-
|vpiParent:
3645-
\_operation: , line:10:7, endln:10:74
3646-
|vpiOpType:11
3647-
|vpiOperand:
3648-
\_constant: , line:10:43, endln:10:57
3649-
|vpiParent:
3650-
\_operation: , line:10:43, endln:10:67
3651-
|vpiDecompile:48
3652-
|vpiSize:32
3653-
|UINT:48
3654-
|vpiTypespec:
3655-
\_int_typespec:
3656-
|vpiParent:
3657-
\_constant: , line:10:43, endln:10:57
3658-
|vpiConstType:9
3659-
|vpiOperand:
3660-
\_constant: , line:10:58, endln:10:67
3661-
|vpiParent:
3662-
\_operation: , line:10:43, endln:10:67
3663-
|vpiDecompile:13
3664-
|vpiSize:64
3665-
|UINT:13
3666-
|vpiConstType:9
3667-
|vpiOperand:
3668-
\_constant: , line:10:72, endln:10:73
3669-
|vpiParent:
3670-
\_operation: , line:10:7, endln:10:74
3671-
|vpiDecompile:0
3672-
|vpiSize:64
3673-
|UINT:0
3674-
|vpiConstType:9
3600+
\_constant: , line:10:5, endln:10:93
3601+
|vpiDecompile:35
3602+
|vpiSize:64
3603+
|INT:35
3604+
|vpiConstType:7
36753605
|vpiOperand:
36763606
\_operation: , line:10:75, endln:10:92
36773607
|vpiParent:
@@ -3737,30 +3667,11 @@ design: (work@top)
37373667
\_indexed_part_select: , line:10:98, endln:10:166
37383668
|vpiOpType:32
37393669
|vpiOperand:
3740-
\_operation: , line:10:103, endln:10:131
3741-
|vpiParent:
3742-
\_operation: , line:10:102, endln:10:165
3743-
|vpiOpType:20
3744-
|vpiOperand:
3745-
\_constant: , line:10:104, endln:10:118
3746-
|vpiParent:
3747-
\_operation: , line:10:103, endln:10:131
3748-
|vpiDecompile:48
3749-
|vpiSize:32
3750-
|UINT:48
3751-
|vpiTypespec:
3752-
\_int_typespec:
3753-
|vpiParent:
3754-
\_constant: , line:10:104, endln:10:118
3755-
|vpiConstType:9
3756-
|vpiOperand:
3757-
\_constant: , line:10:121, endln:10:130
3758-
|vpiParent:
3759-
\_operation: , line:10:103, endln:10:131
3760-
|vpiDecompile:13
3761-
|vpiSize:64
3762-
|UINT:13
3763-
|vpiConstType:9
3670+
\_constant: , line:10:102, endln:10:165
3671+
|vpiDecompile:0
3672+
|vpiSize:64
3673+
|UINT:0
3674+
|vpiConstType:9
37643675
|vpiOperand:
37653676
\_constant: , line:10:136, endln:10:150
37663677
|vpiParent:

0 commit comments

Comments
 (0)