Explorar o código

Poster update

Min %!s(int64=5) %!d(string=hai) anos
pai
achega
6403a8c7a1
Modificáronse 5 ficheiros con 1853 adicións e 3330 borrados
  1. 23 23
      docs/poster/poster.tex
  2. 4 4
      docs/poster/uclposter.cls
  3. 1460 3284
      docs/tests/cycles.eps
  4. 32 19
      docs/tests/cycles.m
  5. 334 0
      docs/tests/cycles.svg

+ 23 - 23
docs/poster/poster.tex

@@ -1,4 +1,4 @@
-\documentclass[portrait,color=UCLmidgreen,margin=1.5cm,bannerheight=8cm,logoheight=2.5cm]{uclposter}
+\documentclass[portrait,color=UCLmidgreen,margin=1.5cm,bannerheight=8cm,logoheight=3.5cm]{uclposter}
 \usepackage{tikz}
 \usepackage[scaled=1.2]{helvet}
 \renewcommand\familydefault{\sfdefault} 
@@ -192,12 +192,12 @@
 			\item[$\bullet$] Sieve of Atkins (prime number calculator, up to 16bit number)
 		\end{description}
 		\vfill
-		\begin{center}
+		\begin{center}
 			\renewcommand{\arraystretch}{1.5}
-			\begin{tabular}{ | l | c | c | c | }
-				\hline
-				& \textbf{Baseline} & \textbf{RISC} & \textbf{OISC} \\ \hline
-				Logic Elements 	& 293 & 1771 & 1705 \\ \hline
+			\begin{tabular}{ | l | c | c | c | }
+				\hline
+				& \textbf{Baseline} & \textbf{RISC} & \textbf{OISC} \\ \hline
+				Logic Elements 	& 293 & 1771 & 1705 \\ \hline
 				Registers 		& 169 & 602 & 724  \\ \hline
 			\end{tabular}
 		\\[2mm]
@@ -230,10 +230,10 @@
 %		\end{description}
 %	\end{Cell}\begin{Cell}{2}
 %		\textbf{Number of cycles per function:}
-%		\begin{center}
-%		\begin{tabular}{ | l | c | c | }
-%			\hline
-%			\textbf{Function} & \textbf{RISC} & \textbf{OISC} \\ \hline
+%		\begin{center}
+%		\begin{tabular}{ | l | c | c | }
+%			\hline
+%			\textbf{Function} & \textbf{RISC} & \textbf{OISC} \\ \hline
 %			16bit division \texttt{FFFFh/0001h} & - & 963 \\ \hline
 %			16bit division \texttt{FFFFh/FFFFh} & - & 663 \\ \hline
 %			16bit division \texttt{0001h/FFFFh} & - & 598 \\ \hline
@@ -241,25 +241,25 @@
 %			16bit modulus \texttt{FFFFh\%FFFFh} & - & 99 \\ \hline
 %			16bit modulus \texttt{0001h\%FFFFh} & - & 49 \\ \hline
 %			16bit multiply & - & 55  \\ \hline
-%		\end{tabular}
+%		\end{tabular}
 %		\end{center}
 %	
 %		\textbf{Number of FPGA resources:}
-%		\begin{center}
-%		\begin{tabular}{ | l | c | c | c | }
-%			\hline
-%			& \textbf{Baseline} & \textbf{RISC} & \textbf{OISC} \\ \hline
-%			Logic Elements 	& 293 & 1771 & 1705 \\ \hline
+%		\begin{center}
+%		\begin{tabular}{ | l | c | c | c | }
+%			\hline
+%			& \textbf{Baseline} & \textbf{RISC} & \textbf{OISC} \\ \hline
+%			Logic Elements 	& 293 & 1771 & 1705 \\ \hline
 %			Registers 		& 169 & 602 & 724  \\ \hline
-%		\end{tabular}
+%		\end{tabular}
 %		\end{center}
 %		\textbf{Power consumption (mW):}
-%		\begin{center}
-%		\begin{tabular}{ | c | c | c | }
-%			\hline
-%			\textbf{Baseline} & \textbf{RISC} & \textbf{OISC} \\ \hline
-%			359.09 $\pm$ 0.245 & 360.851 $\pm$ 0.239 & 360.732 $\pm$ 0.223 \\ \hline
-%		\end{tabular}
+%		\begin{center}
+%		\begin{tabular}{ | c | c | c | }
+%			\hline
+%			\textbf{Baseline} & \textbf{RISC} & \textbf{OISC} \\ \hline
+%			359.09 $\pm$ 0.245 & 360.851 $\pm$ 0.239 & 360.732 $\pm$ 0.223 \\ \hline
+%		\end{tabular}
 %		\end{center}
 %	\end{Cell}\begin{Cell}{2}
 %		\includegraphics[width=\linewidth]{../tests/power.eps}

+ 4 - 4
docs/poster/uclposter.cls

@@ -194,16 +194,16 @@
 	% include title
 	\parbox[s][\uclposter@bannertextheight][s]{\uclposter@bannertextwidth}{%
 		\color{\uclposter@foregroundcolor}%
-		\centering
+		\centering\hspace*{-4cm}
 		{\LARGE\bfseries\addfontfeature{LetterSpace=3}\@title}%
 		\\[12mm]%
 		\par\vfill%
-		{\Large Mindaugas Jarmolovi\v{c}ius}%
+		{\hspace*{-8cm}\Large Mindaugas Jarmolovi\v{c}ius}%
 		\par\vfill%
-		{\Large	Supervisor: Prof. Robert Killey}%
+		{\hspace*{-8cm}\Large	Supervisor: Prof. Robert Killey}%
 		\\[5mm]%
 		\par\vfill%
-		{\normalsize Department of Electronic \& Electrical Engineering, University College London}%
+		{\hspace*{-8cm}\normalsize Department of Electronic \& Electrical Engineering, University College London}%
 	}%
 	\vspace{-\parskip}%
 	\vspace{2\uclposter@margin}%

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1460 - 3284
docs/tests/cycles.eps


+ 32 - 19
docs/tests/cycles.m

@@ -1,31 +1,43 @@
 close all
+%set(0,'defaulttextinterpreter','latex')
+%set(0,'DefaultTextFontname', 'CMU Serif')
+%set(0,'DefaultAxesFontName', 'CMU Serif')
+%text(0.5, 0.8, '\textsf{sans serif}','interpreter','latex')
 data = [
-    0 963;
-    0 663;
-    0 598;
-    0 1076;
-    0 99;
-    0 49;
-    0 55];
+    NaN 963;
+    NaN 663;
+    NaN 598;
+    618 1076;
+    59 99;
+    27 49;
+    52 55];
 grid on
 legend
 B = bar(1:7,data);
-x_labels = [
-    {'\begin{tabular}{r}\texttt{Divide}\\\texttt{FFFFh/0001h}\end{tabular}'}
-    {'\begin{tabular}{r}\texttt{Divide}\\\texttt{FFFFh/FFFFh}\end{tabular}'}
-    {'\begin{tabular}{r}\texttt{Divide}\\\texttt{0001h/FFFFh}\end{tabular}'}
-    {'\begin{tabular}{r}\texttt{Modulus}\\\texttt{FFFFh\%0001h}\end{tabular}'}
-    {'\begin{tabular}{r}\texttt{Modulus}\\\texttt{FFFFh\%FFFFh}\end{tabular}'}
-    {'\begin{tabular}{r}\texttt{Modulus}\\\texttt{0001h\%FFFFh}\end{tabular}'}
-    {'\begin{tabular}{r}\texttt{Multiply 16bit}\end{tabular}'}
-];
-set(gca,'XTickLabel', x_labels, 'TickLabelInterpreter', 'latex')
+x_labels{1} = sprintf('Divide FFFFh/0001h');
+x_labels{2} = sprintf('Divide FFFFh/FFFFh');
+x_labels{3} = sprintf('Divide 0001h/FFFFh');
+x_labels{4} = sprintf('Module FFFFh/0001h');
+x_labels{5} = sprintf('Module FFFFh/FFFFh');
+x_labels{6} = sprintf('Module 0001h/FFFFh');
+x_labels{7} = sprintf('Multiply 16bit');
+set(gca,'XTickLabel', x_labels);
+%x_labels = [
+    %{'\begin{tabular}{r}Divide\\FFFFh/0001h\end{tabular}'}
+    %{'\begin{tabular}{r}Divide\\FFFFh/FFFFh\end{tabular}'}
+    %{'\begin{tabular}{r}Divide\\0001h/FFFFh\end{tabular}'}
+    %{'\begin{tabular}{r}Modulus\\FFFFh\%0001h\end{tabular}'}
+    %{'\begin{tabular}{r}Modulus\\FFFFh\%FFFFh\end{tabular}'}
+    %{'\begin{tabular}{r}Modulus\\0001h\%FFFFh\end{tabular}'}
+    %{'\begin{tabular}{r}Multiply 16bit\end{tabular}'}
+%];
+%set(gca,'XTickLabel', x_labels, 'TickLabelInterpreter', 'latex')
 title("Processor cycles per function")
 ylabel("Numer of cycles")
-xtickangle(40);
+xtickangle(30);
 xtips1 = [1:7] - 0.21;
 ytips1 = B(1).YData;
-labels1 = ['N/A'];
+labels1 = string(B(1).YData);
 text(xtips1,ytips1,labels1,'HorizontalAlignment','center','VerticalAlignment','bottom');
 xtips2 = [1:7] + 0.21;
 ytips2 = B(2).YData;
@@ -34,6 +46,7 @@ text(xtips2,ytips2,labels2,'HorizontalAlignment','center','VerticalAlignment','b
 
 legend("RISC", "OISC");
 grid on
+%set(gcf, 'Color', 'None')
 
 
 %%

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 334 - 0
docs/tests/cycles.svg