Skip to content

Commit

Permalink
uint04: update tests (no verifying error)
Browse files Browse the repository at this point in the history
  • Loading branch information
@Obijuan
Obijuan committed Nov 4, 2023
1 parent ef2e4fb commit 295a7be
Show file tree
Hide file tree
Showing 3 changed files with 88 additions and 183 deletions.
96 changes: 38 additions & 58 deletions examples/TESTs/Uint/Uint04/01-Bit/Alhambra-II/01-Manual-testing.ice
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
"id": "fd14ed5d-e91b-42a8-922f-414275d054bf",
"type": "basic.info",
"data": {
"info": "## Uint4-1bit: Manual testing",
"info": "## 01-Uint4: Manual testing",
"readonly": true
},
"position": {
Expand All @@ -95,8 +95,8 @@
}
},
{
"id": "c45706be-56e7-4966-aa93-412591e023cc",
"type": "a4e8c16ea1c0ebc123bab8a9d25b07275cf8e4a9",
"id": "ba431256-6ef7-44f3-9029-a54b9704a236",
"type": "dcbc67d8d86dd32db3fd9daa39104733c6972837",
"position": {
"x": 560,
"y": 56
Expand All @@ -114,8 +114,8 @@
"port": "out"
},
"target": {
"block": "c45706be-56e7-4966-aa93-412591e023cc",
"port": "1993c7e0-d407-4ae2-8c18-2f4cfab7cd1b"
"block": "ba431256-6ef7-44f3-9029-a54b9704a236",
"port": "418dea9f-f4c9-4a1f-8294-0f6c34e32f1d"
}
},
{
Expand All @@ -131,8 +131,8 @@
},
{
"source": {
"block": "c45706be-56e7-4966-aa93-412591e023cc",
"port": "a27a9eb1-cacc-489b-8841-b19428732584"
"block": "ba431256-6ef7-44f3-9029-a54b9704a236",
"port": "e0cb078e-5589-4f38-983f-ff5d02d74932"
},
"target": {
"block": "3346a117-bf92-44c8-8ba0-27382230e0ca",
Expand Down Expand Up @@ -889,11 +889,11 @@
}
}
},
"a4e8c16ea1c0ebc123bab8a9d25b07275cf8e4a9": {
"dcbc67d8d86dd32db3fd9daa39104733c6972837": {
"package": {
"name": "UINT4-1bit-verilog",
"version": "0.2",
"description": "UINT4-1bit-verilog: Extend a 1-bit unsigned integer to 4-bits. Verilog implementation ",
"name": "01-Uint04",
"version": "0.4",
"description": "01-Uint04: 1 bits unsigned integer extension to 4 bits. Verilog implementation",
"author": "Juan González-Gómez (Obijuan)",
"image": "%3Csvg%20xmlns=%22http://www.w3.org/2000/svg%22%20width=%22448.598%22%20height=%22127.811%22%20viewBox=%220%200%20118.69152%2033.816643%22%3E%3Cg%20style=%22line-height:1.25%22%20font-weight=%22700%22%20font-size=%2245.504%22%20font-family=%22sans-serif%22%20fill=%22green%22%20stroke-width=%221.138%22%3E%3Cpath%20d=%22M0%200h8.554v19.886q0%204.11%201.333%205.888%201.356%201.755%204.4%201.755%203.066%200%204.399-1.755%201.355-1.778%201.355-5.888V0h8.554v19.886q0%207.043-3.532%2010.487-3.533%203.444-10.776%203.444-7.221%200-10.754-3.444Q0%2026.929%200%2019.886zM36.972%200h8.554v33.172h-8.554zM53.947%200H63.5l12.064%2022.752V0h8.11v33.172h-9.554L62.056%2010.421v22.751h-8.11zM88.119%200h30.573v6.466h-10.999v26.706H99.14V6.466H88.12z%22%20style=%22-inkscape-font-specification:'sans-serif%20Bold'%22/%3E%3C/g%3E%3C/svg%3E",
"otid": 1621785467119
Expand All @@ -902,50 +902,28 @@
"graph": {
"blocks": [
{
"id": "1993c7e0-d407-4ae2-8c18-2f4cfab7cd1b",
"type": "basic.input",
"id": "e0cb078e-5589-4f38-983f-ff5d02d74932",
"type": "basic.output",
"data": {
"name": "",
"clock": false
"range": "[3:0]",
"size": 4
},
"position": {
"x": 352,
"y": 304
"x": 952,
"y": 368
}
},
{
"id": "a27a9eb1-cacc-489b-8841-b19428732584",
"type": "basic.output",
"id": "418dea9f-f4c9-4a1f-8294-0f6c34e32f1d",
"type": "basic.input",
"data": {
"name": "",
"virtual": true,
"range": "[3:0]",
"pins": [
{
"index": "3",
"name": "NULL",
"value": "NULL"
},
{
"index": "2",
"name": "NULL",
"value": "NULL"
},
{
"index": "1",
"name": "NULL",
"value": "NULL"
},
{
"index": "0",
"name": "NULL",
"value": "NULL"
}
]
"size": 1
},
"position": {
"x": 920,
"y": 304
"x": 336,
"y": 368
}
},
{
Expand All @@ -955,7 +933,8 @@
"ports": {
"in": [
{
"name": "i"
"name": "i",
"size": 1
}
],
"out": [
Expand All @@ -967,39 +946,40 @@
]
},
"params": [],
"code": "//-- Number of bits\nlocalparam N = 4;\n\n//-- Extend i with N-1 0s\nassign o = { {(N-1){1'b0}} , i};"
"code": "//-- Number of input bits\nlocalparam X = 1;\n\n//-- Number of output bits\nlocalparam N = 4;\n\n//-- zeros to add to the input\nwire zeros = {(N-X){1'b0}};\n\n//-- Extend the input with zeros\nassign o = { zeros , i};"
},
"position": {
"x": 504,
"y": 272
},
"size": {
"width": 344,
"height": 120
"width": 384,
"height": 248
}
}
],
"wires": [
{
"source": {
"block": "1993c7e0-d407-4ae2-8c18-2f4cfab7cd1b",
"port": "out"
"block": "060b73c2-8fae-4f64-8db2-c8335f464d4c",
"port": "o"
},
"target": {
"block": "060b73c2-8fae-4f64-8db2-c8335f464d4c",
"port": "i"
}
"block": "e0cb078e-5589-4f38-983f-ff5d02d74932",
"port": "in"
},
"size": 4
},
{
"source": {
"block": "060b73c2-8fae-4f64-8db2-c8335f464d4c",
"port": "o"
"block": "418dea9f-f4c9-4a1f-8294-0f6c34e32f1d",
"port": "out"
},
"target": {
"block": "a27a9eb1-cacc-489b-8841-b19428732584",
"port": "in"
"block": "060b73c2-8fae-4f64-8db2-c8335f464d4c",
"port": "i"
},
"size": 4
"size": 1
}
]
}
Expand Down
85 changes: 25 additions & 60 deletions examples/TESTs/Uint/Uint04/02-Bits/Alhambra-II/01-Manual-testing.ice
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
"id": "fd14ed5d-e91b-42a8-922f-414275d054bf",
"type": "basic.info",
"data": {
"info": "## Uint4-2bit: Manual testing",
"info": "## 02-Uint4: Manual testing",
"readonly": true
},
"position": {
Expand Down Expand Up @@ -107,8 +107,8 @@
}
},
{
"id": "54738f45-2f51-442a-b87d-a9ba55fa4c28",
"type": "7a5eb2c606e75362cb0ae18eff3f7edc6453d12f",
"id": "17cda459-15aa-46d4-a446-f98f199d736d",
"type": "2d4b5915ca74d270f8286b1dfb0f95d944112245",
"position": {
"x": 560,
"y": 56
Expand All @@ -133,8 +133,8 @@
},
{
"source": {
"block": "54738f45-2f51-442a-b87d-a9ba55fa4c28",
"port": "a27a9eb1-cacc-489b-8841-b19428732584"
"block": "17cda459-15aa-46d4-a446-f98f199d736d",
"port": "e0cb078e-5589-4f38-983f-ff5d02d74932"
},
"target": {
"block": "3346a117-bf92-44c8-8ba0-27382230e0ca",
Expand All @@ -148,8 +148,8 @@
"port": "a2b77ebf-2ba8-494f-bf22-b2410234d608"
},
"target": {
"block": "54738f45-2f51-442a-b87d-a9ba55fa4c28",
"port": "b2fd26b0-6167-41aa-86f5-ba413b589ce7"
"block": "17cda459-15aa-46d4-a446-f98f199d736d",
"port": "418dea9f-f4c9-4a1f-8294-0f6c34e32f1d"
},
"size": 2
},
Expand Down Expand Up @@ -1006,11 +1006,11 @@
}
}
},
"7a5eb2c606e75362cb0ae18eff3f7edc6453d12f": {
"2d4b5915ca74d270f8286b1dfb0f95d944112245": {
"package": {
"name": "UINT4-2bit-verilog",
"version": "0.2",
"description": "UINT4-2bit-verilog: Extend a 2-bit unsigned integer to 4-bits. Verilog implementation ",
"name": "02-Uint04",
"version": "0.4",
"description": "02-Uint04: 2 bits unsigned integer extension to 4 bits. Verilog implementation",
"author": "Juan González-Gómez (Obijuan)",
"image": "%3Csvg%20xmlns=%22http://www.w3.org/2000/svg%22%20width=%22448.598%22%20height=%22127.811%22%20viewBox=%220%200%20118.69152%2033.816643%22%3E%3Cg%20style=%22line-height:1.25%22%20font-weight=%22700%22%20font-size=%2245.504%22%20font-family=%22sans-serif%22%20fill=%22green%22%20stroke-width=%221.138%22%3E%3Cpath%20d=%22M0%200h8.554v19.886q0%204.11%201.333%205.888%201.356%201.755%204.4%201.755%203.066%200%204.399-1.755%201.355-1.778%201.355-5.888V0h8.554v19.886q0%207.043-3.532%2010.487-3.533%203.444-10.776%203.444-7.221%200-10.754-3.444Q0%2026.929%200%2019.886zM36.972%200h8.554v33.172h-8.554zM53.947%200H63.5l12.064%2022.752V0h8.11v33.172h-9.554L62.056%2010.421v22.751h-8.11zM88.119%200h30.573v6.466h-10.999v26.706H99.14V6.466H88.12z%22%20style=%22-inkscape-font-specification:'sans-serif%20Bold'%22/%3E%3C/g%3E%3C/svg%3E",
"otid": 1621785467119
Expand All @@ -1019,64 +1019,29 @@
"graph": {
"blocks": [
{
"id": "a27a9eb1-cacc-489b-8841-b19428732584",
"id": "e0cb078e-5589-4f38-983f-ff5d02d74932",
"type": "basic.output",
"data": {
"name": "",
"virtual": true,
"range": "[3:0]",
"pins": [
{
"index": "3",
"name": "NULL",
"value": "NULL"
},
{
"index": "2",
"name": "NULL",
"value": "NULL"
},
{
"index": "1",
"name": "NULL",
"value": "NULL"
},
{
"index": "0",
"name": "NULL",
"value": "NULL"
}
]
"size": 4
},
"position": {
"x": 920,
"y": 304
"x": 952,
"y": 368
}
},
{
"id": "b2fd26b0-6167-41aa-86f5-ba413b589ce7",
"id": "418dea9f-f4c9-4a1f-8294-0f6c34e32f1d",
"type": "basic.input",
"data": {
"name": "i",
"virtual": true,
"name": "",
"range": "[1:0]",
"pins": [
{
"index": "1",
"name": "NULL",
"value": "NULL"
},
{
"index": "0",
"name": "NULL",
"value": "NULL"
}
],
"clock": false
"size": 2
},
"position": {
"x": 352,
"y": 304
"x": 336,
"y": 368
}
},
{
Expand All @@ -1100,15 +1065,15 @@
]
},
"params": [],
"code": "//-- Number of bits\nlocalparam N = 4;\n\n//-- Extend i with N-2 0s\nassign o = { {(N-2){1'b0}} , i};"
"code": "//-- Number of input bits\nlocalparam X = 2;\n\n//-- Number of output bits\nlocalparam N = 4;\n\n//-- zeros to add to the input\nwire zeros = {(N-X){1'b0}};\n\n//-- Extend the input with zeros\nassign o = { zeros , i};"
},
"position": {
"x": 504,
"y": 272
},
"size": {
"width": 344,
"height": 120
"width": 384,
"height": 248
}
}
],
Expand All @@ -1119,14 +1084,14 @@
"port": "o"
},
"target": {
"block": "a27a9eb1-cacc-489b-8841-b19428732584",
"block": "e0cb078e-5589-4f38-983f-ff5d02d74932",
"port": "in"
},
"size": 4
},
{
"source": {
"block": "b2fd26b0-6167-41aa-86f5-ba413b589ce7",
"block": "418dea9f-f4c9-4a1f-8294-0f6c34e32f1d",
"port": "out"
},
"target": {
Expand Down
Loading

0 comments on commit 295a7be

Please sign in to comment.