From 983fb16f91a8bfe13d7c5bcf38a5f46abe028b0a Mon Sep 17 00:00:00 2001 From: Eduardosmb Date: Wed, 17 Aug 2022 15:23:42 -0300 Subject: [PATCH 01/22] update Grupo --- GRUPO.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GRUPO.yml b/GRUPO.yml index 03d4a8fc..ae7367c0 100644 --- a/GRUPO.yml +++ b/GRUPO.yml @@ -1,3 +1,3 @@ { - Nome-Grupo: "Macarrao" + Nome-Grupo: "Cria" } From d712372222be7e42e0e9c83ece1ee17fa48e2af3 Mon Sep 17 00:00:00 2001 From: Eduardosmb Date: Wed, 17 Aug 2022 15:30:02 -0300 Subject: [PATCH 02/22] update Grupo --- GRUPO.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GRUPO.yml b/GRUPO.yml index ae7367c0..b4b9f103 100644 --- a/GRUPO.yml +++ b/GRUPO.yml @@ -1,3 +1,3 @@ { - Nome-Grupo: "Cria" + Nome-Grupo: "criado" } From 415853d5c1fc8902058026405b0fda17a74c9f10 Mon Sep 17 00:00:00 2001 From: Eduardosmb Date: Mon, 29 Aug 2022 15:01:11 -0300 Subject: [PATCH 03/22] json --- INTEGRANTES.json | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 INTEGRANTES.json diff --git a/INTEGRANTES.json b/INTEGRANTES.json new file mode 100644 index 00000000..eb94221a --- /dev/null +++ b/INTEGRANTES.json @@ -0,0 +1,4 @@ +- user: 1 +name: Eduardo Schneider Monteiro de Barros +git-username: eduardosmb +email: eduardosmb@al.insper.edu \ No newline at end of file From 0826a8ff9047d51a605bc7ecd1052931d60fde96 Mon Sep 17 00:00:00 2001 From: Eriksoaress Date: Mon, 29 Aug 2022 15:02:31 -0300 Subject: [PATCH 04/22] user 2 Erik --- INTEGRANTES.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/INTEGRANTES.json b/INTEGRANTES.json index eb94221a..eaa45f9b 100644 --- a/INTEGRANTES.json +++ b/INTEGRANTES.json @@ -1,4 +1,9 @@ - user: 1 name: Eduardo Schneider Monteiro de Barros git-username: eduardosmb -email: eduardosmb@al.insper.edu \ No newline at end of file +email: eduardosmb@al.insper.edu + +- user: 2 + name: Erik Leonardo Soares de Oliveira + git-username: eriksoaress + blackboard-username: eriklso From 75a660ee8c46b43da170905a01d639c9f486b89a Mon Sep 17 00:00:00 2001 From: C0D8 Date: Mon, 29 Aug 2022 15:03:23 -0300 Subject: [PATCH 05/22] Nome Matheus --- INTEGRANTES.json | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/INTEGRANTES.json b/INTEGRANTES.json index eb94221a..7048f498 100644 --- a/INTEGRANTES.json +++ b/INTEGRANTES.json @@ -1,4 +1,11 @@ - user: 1 name: Eduardo Schneider Monteiro de Barros git-username: eduardosmb -email: eduardosmb@al.insper.edu \ No newline at end of file +email: eduardosmb@al.insper.edu + + + +-user: 4 +name: Matheus Aguiar de Jesus +git-username: c0d8 +email: matheusaj@al.insper.edu \ No newline at end of file From fe1bd03bb84639734e38a65ff9667360023cf030 Mon Sep 17 00:00:00 2001 From: Eriksoaress Date: Mon, 29 Aug 2022 15:06:17 -0300 Subject: [PATCH 06/22] Adicionando Erik ao arquivo --- INTEGRANTES.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/INTEGRANTES.json b/INTEGRANTES.json index eaa45f9b..fe6ca546 100644 --- a/INTEGRANTES.json +++ b/INTEGRANTES.json @@ -6,4 +6,4 @@ email: eduardosmb@al.insper.edu - user: 2 name: Erik Leonardo Soares de Oliveira git-username: eriksoaress - blackboard-username: eriklso + email: eriklso@al.insper.edu.br From f8ea35d45934147f939b7773b9047fa22ba67e5a Mon Sep 17 00:00:00 2001 From: GustavoAntony <105286051+GustavoAntony@users.noreply.github.com> Date: Mon, 29 Aug 2022 15:10:32 -0300 Subject: [PATCH 07/22] Adicionando nome --- INTEGRANTES.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/INTEGRANTES.json b/INTEGRANTES.json index eaa45f9b..7e1ad706 100644 --- a/INTEGRANTES.json +++ b/INTEGRANTES.json @@ -7,3 +7,9 @@ email: eduardosmb@al.insper.edu name: Erik Leonardo Soares de Oliveira git-username: eriksoaress blackboard-username: eriklso + +- user: 3 +name: Gustavo Antony de Assis +git-username: GustavoAntony +blackboard-username:gustavoa9 +insper-email: gustavoa9@al.insper.edu.br From 5ea979ce09dd9a98cf9a57a65807787c69d97a3a Mon Sep 17 00:00:00 2001 From: C0D8 Date: Mon, 29 Aug 2022 15:15:56 -0300 Subject: [PATCH 08/22] Testando Pull request --- INTEGRANTES.json | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/INTEGRANTES.json b/INTEGRANTES.json index dd02c41e..1c97e360 100644 --- a/INTEGRANTES.json +++ b/INTEGRANTES.json @@ -3,16 +3,13 @@ name: Eduardo Schneider Monteiro de Barros git-username: eduardosmb email: eduardosmb@al.insper.edu - - - - user: 4 name: Matheus Aguiar de Jesus git-username: c0d8 email: matheusaj@al.insper.edu - user: 2 - name: Erik Leonardo Soares de Oliveira - git-username: eriksoaress - blackboard-username: eriklso +name: Erik Leonardo Soares de Oliveira +git-username: eriksoaress +blackboard-username: eriklso From b298770b1479abc007782c219189242376aa8291 Mon Sep 17 00:00:00 2001 From: GustavoAntony <105286051+GustavoAntony@users.noreply.github.com> Date: Mon, 29 Aug 2022 15:23:09 -0300 Subject: [PATCH 09/22] Add nome --- INTEGRANTES.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/INTEGRANTES.json b/INTEGRANTES.json index dd02c41e..902ff405 100644 --- a/INTEGRANTES.json +++ b/INTEGRANTES.json @@ -3,8 +3,10 @@ name: Eduardo Schneider Monteiro de Barros git-username: eduardosmb email: eduardosmb@al.insper.edu - - +-user: 3 +name: Gustavo Antony de Assis +git-username: GustavoAntony +email: gustavoa9@al.insper.edu - user: 4 name: Matheus Aguiar de Jesus From a138cc3497a93e024c0bbbf587af15d8606b8ea2 Mon Sep 17 00:00:00 2001 From: Marcelo Marchetto Date: Mon, 5 Sep 2022 13:39:18 -0300 Subject: [PATCH 10/22] Adicionando MARCELO ao arquivo --- INTEGRANTES.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/INTEGRANTES.json b/INTEGRANTES.json index cfce1918..487141ce 100644 --- a/INTEGRANTES.json +++ b/INTEGRANTES.json @@ -19,3 +19,8 @@ name: Matheus Aguiar de Jesus git-username: c0d8 email: matheusaj@al.insper.edu +- user: 5 +name: Marcelo Vampré Ferreira Marchetto +git-username: marchettomarcelo +email: marcelovfm@al.insper.edu.br + From 5828c0a28974d8b1e5f6f605fcd95e059e25b84f Mon Sep 17 00:00:00 2001 From: marcelo Date: Mon, 5 Sep 2022 15:40:36 -0300 Subject: [PATCH 11/22] and6 --- hw/components.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/hw/components.py b/hw/components.py index aa9336e9..c094a0d2 100644 --- a/hw/components.py +++ b/hw/components.py @@ -12,11 +12,10 @@ def and16(a, b, q): and bit a bit entre a e b """ - foo = Signal(0) @always_comb def comb(): - q.next = foo + q.next = a and b return comb From 1f58a2bd31bde4500fee3cea71c28deb7dca4326 Mon Sep 17 00:00:00 2001 From: van-neumann Date: Fri, 9 Sep 2022 13:47:09 -0300 Subject: [PATCH 12/22] teste do orNway passando --- .github/workflows/components.yml | 4 ++++ .gitignore | 1 + hw/components.py | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/components.yml b/.github/workflows/components.yml index 3f26be75..2d58aeb6 100644 --- a/.github/workflows/components.yml +++ b/.github/workflows/components.yml @@ -31,3 +31,7 @@ jobs: - name: test and16 run: | pytest hw/test_components.py -k and16 + + - name: test and16 + run: | + pytest hw/test_components.py -k orNway \ No newline at end of file diff --git a/.gitignore b/.gitignore index 168e776a..08985706 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ htmlcov *.v .direnv/ *.ini +env \ No newline at end of file diff --git a/hw/components.py b/hw/components.py index aa9336e9..9887d98a 100644 --- a/hw/components.py +++ b/hw/components.py @@ -49,7 +49,7 @@ def orNway(a, q): @always_comb def comb(): - q.next = foo + q.next = a[0] or a[1] return comb From d6f0467faab4962429d17b46f4346f02fc5c222a Mon Sep 17 00:00:00 2001 From: van-neumann Date: Fri, 9 Sep 2022 13:52:12 -0300 Subject: [PATCH 13/22] tirandos os testes errados --- .github/workflows/components.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/components.yml b/.github/workflows/components.yml index 2d58aeb6..798d5db8 100644 --- a/.github/workflows/components.yml +++ b/.github/workflows/components.yml @@ -28,10 +28,7 @@ jobs: pip install -r requirements.txt # ------------- Tests ---------------- - - name: test and16 - run: | - pytest hw/test_components.py -k and16 - name: test and16 run: | - pytest hw/test_components.py -k orNway \ No newline at end of file + pytest hw/test_components.py -k orNway \ No newline at end of file From dfcedc9fcafb09a60079045bf7af848bc5b3ecf3 Mon Sep 17 00:00:00 2001 From: van-neumann Date: Fri, 9 Sep 2022 14:20:36 -0300 Subject: [PATCH 14/22] test mux4way passando --- .github/workflows/components.yml | 5 +++-- .gitignore | 1 + hw/components.py | 16 +++++++++++++++- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/.github/workflows/components.yml b/.github/workflows/components.yml index 3f26be75..bdb5b401 100644 --- a/.github/workflows/components.yml +++ b/.github/workflows/components.yml @@ -28,6 +28,7 @@ jobs: pip install -r requirements.txt # ------------- Tests ---------------- - - name: test and16 + - name: test mux4way run: | - pytest hw/test_components.py -k and16 + pytest -k test_mux4way -v + diff --git a/.gitignore b/.gitignore index 168e776a..08985706 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ htmlcov *.v .direnv/ *.ini +env \ No newline at end of file diff --git a/hw/components.py b/hw/components.py index aa9336e9..10065211 100644 --- a/hw/components.py +++ b/hw/components.py @@ -112,7 +112,21 @@ def mux4way(q, a, b, c, d, sel): @always_comb def comb(): - q.next = foo + sel2= str(sel) + print(sel2) + if sel2 == "0": + q.next = a + + if sel2 == "1": + q.next = b + + if sel2 == "2": + q.next = c + + if sel2 == "3": + q.next = d + + return comb From 21955b450a16ad462a77b53ed8b39275fc84d649 Mon Sep 17 00:00:00 2001 From: van-neumann Date: Fri, 9 Sep 2022 14:22:59 -0300 Subject: [PATCH 15/22] nome certo do teste --- .github/workflows/components.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/components.yml b/.github/workflows/components.yml index 798d5db8..66c0d239 100644 --- a/.github/workflows/components.yml +++ b/.github/workflows/components.yml @@ -29,6 +29,6 @@ jobs: # ------------- Tests ---------------- - - name: test and16 + - name: test orNway run: | pytest hw/test_components.py -k orNway \ No newline at end of file From a40b2d60c0d50893813bad8750892b19d3dc740a Mon Sep 17 00:00:00 2001 From: eriksoaress Date: Sun, 11 Sep 2022 10:32:40 -0300 Subject: [PATCH 16/22] deMux4way - Erik --- hw/components.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/hw/components.py b/hw/components.py index aa9336e9..ea59b01c 100644 --- a/hw/components.py +++ b/hw/components.py @@ -167,7 +167,12 @@ def deMux4way(a, q0, q1, q2, q3, sel): @always_comb def comb(): - q0.next = foo + saidas = [q0, q1, q2, q3] + for index in range(0, len(saidas)): + if index == sel: + saidas[index].next = a + else: + saidas[index].next = 0 return comb From c42226cf15c3994d25779e6793fdf7b9a4628f4b Mon Sep 17 00:00:00 2001 From: eriksoaress Date: Sun, 11 Sep 2022 10:52:01 -0300 Subject: [PATCH 17/22] barrelShifter - Erik --- hw/components.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hw/components.py b/hw/components.py index ea59b01c..d6c47620 100644 --- a/hw/components.py +++ b/hw/components.py @@ -72,7 +72,10 @@ def barrelShifter(a, dir, size, q): @always_comb def comb(): - q.next = foo + if dir == 0: + q.next = a >> size + else: + q.next = a << size return comb From 3b1151f2e2fd719a1610d6568ac36615a97712f8 Mon Sep 17 00:00:00 2001 From: eriksoaress Date: Sun, 11 Sep 2022 11:08:30 -0300 Subject: [PATCH 18/22] deMux4way --- hw/components.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/hw/components.py b/hw/components.py index d6c47620..ea59b01c 100644 --- a/hw/components.py +++ b/hw/components.py @@ -72,10 +72,7 @@ def barrelShifter(a, dir, size, q): @always_comb def comb(): - if dir == 0: - q.next = a >> size - else: - q.next = a << size + q.next = foo return comb From 7f617217a8fb48ad7d8ee0818aa91bcdc207e74d Mon Sep 17 00:00:00 2001 From: eriksoaress Date: Sun, 11 Sep 2022 11:20:50 -0300 Subject: [PATCH 19/22] barrelShifter --- hw/components.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/hw/components.py b/hw/components.py index ea59b01c..0f97d054 100644 --- a/hw/components.py +++ b/hw/components.py @@ -72,8 +72,10 @@ def barrelShifter(a, dir, size, q): @always_comb def comb(): - q.next = foo - + if dir == 0: + q.next = a >> size + else: + q.next = a << size return comb From 329a31ed1a70a9f64b57097ae3da2261380a7aaa Mon Sep 17 00:00:00 2001 From: eriksoaress Date: Sun, 11 Sep 2022 11:23:31 -0300 Subject: [PATCH 20/22] barrelShifter --- .github/workflows/components.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/components.yml b/.github/workflows/components.yml index 3f26be75..d4c85454 100644 --- a/.github/workflows/components.yml +++ b/.github/workflows/components.yml @@ -28,6 +28,6 @@ jobs: pip install -r requirements.txt # ------------- Tests ---------------- - - name: test and16 + - name: test barrelShifter run: | - pytest hw/test_components.py -k and16 + pytest -k barrelShifter From 5be69b32a9a41a5caf77267305f56933b0e16dec Mon Sep 17 00:00:00 2001 From: GustavoAntony Date: Sun, 11 Sep 2022 13:22:58 -0300 Subject: [PATCH 21/22] deMux2way --- .gitignore | 3 ++- hw/components.py | 10 +++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 08985706..2127e277 100644 --- a/.gitignore +++ b/.gitignore @@ -7,4 +7,5 @@ htmlcov *.v .direnv/ *.ini -env \ No newline at end of file +env +.env \ No newline at end of file diff --git a/hw/components.py b/hw/components.py index 2a6eec8e..744997f9 100644 --- a/hw/components.py +++ b/hw/components.py @@ -84,8 +84,7 @@ def mux2way(q, a, b, sel): b: 16 bits sel: 2 bits - Mux entre a e b, sel é o seletor - """ + Mux entre a e b, sel é o seletor""" foo = Signal(intbv(0)) @always_comb @@ -163,7 +162,12 @@ def deMux2way(a, q0, q1, sel): @always_comb def comb(): - q0.next = foo + lista_entradas = [q0,q1] + for num in range(0, len(lista_entradas)): + if num == sel: + lista_entradas[num].next = a + else: + lista_entradas[num].next = 0 return comb From d463565bbe769f99105d756b94350296691c4500 Mon Sep 17 00:00:00 2001 From: GustavoAntony Date: Sun, 11 Sep 2022 13:38:18 -0300 Subject: [PATCH 22/22] Or8way --- hw/components.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/components.py b/hw/components.py index 2a6eec8e..757778ae 100644 --- a/hw/components.py +++ b/hw/components.py @@ -31,7 +31,7 @@ def or8way(a, b, c, d, e, f, g, h, q): @always_comb def comb(): - q.next = foo + q.next = a or b or c or d or e or f or g or h return comb