<commit_before>#include "vector.h"


# define R(x,i) (  (x << ((Vec){i,i,i,i})) | (x >> ((Vec){32 - i, 32 - i, 32 - i, 32 - i})))

# define QROUND(a,b,c,d)			\
    {						\
	a += b; d ^= a; d = R(d,16);		\
	c += d; b ^= c; b = R(b,12);		\
	a += b; d ^= a; d = R(d,8);		\
	c += d; b ^= c; b = R(b,7);		\
    }						\

/*

  r0 = x0 x1 x2  x3
  r1 = x4 x5 x6  x7
  r2 = x8 x9 x10 x11
  r3 = x12 x13 x14 x15

  QROUND(r0, r1, r2, r3) : Handles row o

  d0 = x0  x1    x2   x3
  d1 = x5  x6    x7   x4
  d2 = x10 x11   x8   x9
  d3 = x15 x12   x13  x14

 */

# ifdef __clang__
#   define SIG  1 , 2 , 3 , 0
#   define SIG2 2 , 3 , 0 , 1
#   define SIG3 3 , 0 , 1 , 2


#   define ISIG  3 , 0 , 1 , 2
#   define ISIG2 2 , 3 , 0 , 1
#   define ISIG3 1 , 2 , 3 , 0

#   define TODIAG					\
    {							\
	B = __builtin_shufflevector(B, B, SIG  );	\
	C = __builtin_shufflevector(C, C, SIG2 );	\
	D = __builtin_shufflevector(D, D, SIG3 );	\
    }

#   define TOROW					\
    {							\
	B = __builtin_shufflevector(B, B, ISIG  );	\
	C = __builtin_shufflevector(C, C, ISIG2 );	\
	D = __builtin_shufflevector(D, D, ISIG3 );	\
    }

# else

#   define SIG  ((Vec){ 1 , 2 , 3 , 0 })
#   define SIG2 ((Vec){ 2 , 3 , 0 , 1 })
#   define SIG3 ((Vec){ 3 , 0 , 1 , 2 })


#   define ISIG  ((Vec){ 3 , 0 , 1 , 2 })
#   define ISIG2 ((Vec){ 2 , 3 , 0  ,1 })
#   define ISIG3 ((Vec){ 1 , 2 , 3 , 0 })



#   define TODIAG				\
    {						\
	B = __builtin_shuffle ( B, SIG  );	\
	C = __builtin_shuffle ( C, SIG2 );	\
	D = __builtin_shuffle ( D, SIG3 );	\
    }


#   define TOROW		      \
    {				      \
	B = __builtin_shuffle(B, ISIG  );	\
	C = __builtin_shuffle(C, ISIG2 );	\
	D = __builtin_shuffle(D, ISIG3 );	\
    }


#endif


# define ROUND							\
     { QROUND(A,B,C,D); TODIAG; QROUND(A,B,C,D); TOROW; }


# define XORA(i) (*msg)[i] ^= raaz_tole32( A[i]    )
# define XORB(i) (*msg)[i] ^= raaz_tole32( B[i-4]  )
# define XORC(i) (*msg)[i] ^= raaz_tole32( C[i-8]  )
# define XORD(i) (*msg)[i] ^= raaz_tole32( D[i-12] )


# define ChaChaConstantRow  ((Vec){ C0     , C1     , C2     ,  C3    })




# if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
#   define INP(i) (((Vec *)msg)[i])
#   define WR(i,R) { MSG  = INP(i); MSG ^= R; INP(i) = MSG; }
#   define WRITE { WR(0,A); WR(1,B); WR(2,C); WR(3,D); }
# else
#   define XORA(i) (*msg)[i] ^= raaz_tole32( A[i]    )
#   define XORB(i) (*msg)[i] ^= raaz_tole32( B[i-4]  )
#   define XORC(i) (*msg)[i] ^= raaz_tole32( C[i-8]  )
#   define XORD(i) (*msg)[i] ^= raaz_tole32( D[i-12] )
#   define WRITE                                        \
    {   XORA(0)  ; XORA(1)  ; XORA(2)  ; XORA(3);       \
        XORB(4)  ; XORB(5)  ; XORB(6)  ; XORB(7);       \
        XORC(8)  ; XORC(9)  ; XORC(10) ; XORC(11);      \
        XORD(12) ; XORD(13) ; XORD(14) ; XORD(15);      \
    }
#  endif /* Byte order */


/* One should ensure that msg is aligned to 16 bytes. */
static inline void chacha20vec128(Block *msg, int nblocks, const Key key, const IV iv, Counter *ctr)
{
    register Vec A , B, C, D;
    register Vec M1, M2, M3;
    register Vec MSG;

    /* TODO: Optimise with vector load (take care of alignments) */

    M1 =  (Vec){ key[0] , key[1] , key[2] , key[3] };
    M2 =  (Vec){ key[4] , key[5] , key[6] , key[7] };
    M3 =  (Vec){ *(ctr) , iv[0]  ,  iv[1] , iv[2]  };

    *ctr += nblocks;

    for(; nblocks > 0; -- nblocks, ++msg)
    {
	/* Initialise the state;
	   Except for the counter everything is the same
	 */

	A = ChaChaConstantRow;
	B = M1; C = M2; D = M3;

	ROUND; /* 0,1   */
	ROUND; /* 2,3   */
	ROUND; /* 4,5   */
	ROUND; /* 6,7   */
	ROUND; /* 8,9   */
	ROUND; /* 10,11 */
	ROUND; /* 12,13 */
	ROUND; /* 14,15 */
	ROUND; /* 16,17 */
	ROUND; /* 18,19 */

	A += ChaChaConstantRow;


	B += M1;
	C += M2;
	D += M3;

	/* TODO: Optimise with vector load (take care of
	 * alignments) */

	WRITE;

	++M3[0];         /* increment counter      */

    }
    return;
}

void raazChaCha20BlockVector(Block *msg, int nblocks, const Key key, const IV iv, Counter *ctr)
{
    chacha20vec128(msg, nblocks, key, iv, ctr);
}
<commit_msg>simplify some definitions.<commit_after>#include "vector.h"


# define R(x,i) (  (x << ((Vec){i,i,i,i})) | (x >> ((Vec){32 - i, 32 - i, 32 - i, 32 - i})))

# define QROUND(a,b,c,d)			\
    {						\
	a += b; d ^= a; d = R(d,16);		\
	c += d; b ^= c; b = R(b,12);		\
	a += b; d ^= a; d = R(d,8);		\
	c += d; b ^= c; b = R(b,7);		\
    }						\

/*

  r0 = x0 x1 x2  x3
  r1 = x4 x5 x6  x7
  r2 = x8 x9 x10 x11
  r3 = x12 x13 x14 x15

  QROUND(r0, r1, r2, r3) : Handles row o

  d0 = x0  x1    x2   x3
  d1 = x5  x6    x7   x4
  d2 = x10 x11   x8   x9
  d3 = x15 x12   x13  x14

 */

# ifdef __clang__
#   define SIG  1 , 2 , 3 , 0
#   define SIG2 2 , 3 , 0 , 1
#   define SIG3 3 , 0 , 1 , 2


#   define ISIG  SIG3
#   define ISIG2 SIG2
#   define ISIG3 SIG

#   define TODIAG					\
    {							\
	B = __builtin_shufflevector(B, B, SIG  );	\
	C = __builtin_shufflevector(C, C, SIG2 );	\
	D = __builtin_shufflevector(D, D, SIG3 );	\
    }

#   define TOROW					\
    {							\
	B = __builtin_shufflevector(B, B, ISIG  );	\
	C = __builtin_shufflevector(C, C, ISIG2 );	\
	D = __builtin_shufflevector(D, D, ISIG3 );	\
    }

# else

#   define SIG  ((Vec){ 1 , 2 , 3 , 0 })
#   define SIG2 ((Vec){ 2 , 3 , 0 , 1 })
#   define SIG3 ((Vec){ 3 , 0 , 1 , 2 })


#   define ISIG  ((Vec){ 3 , 0 , 1 , 2 })
#   define ISIG2 ((Vec){ 2 , 3 , 0  ,1 })
#   define ISIG3 ((Vec){ 1 , 2 , 3 , 0 })



#   define TODIAG				\
    {						\
	B = __builtin_shuffle ( B, SIG  );	\
	C = __builtin_shuffle ( C, SIG2 );	\
	D = __builtin_shuffle ( D, SIG3 );	\
    }


#   define TOROW		      \
    {				      \
	B = __builtin_shuffle(B, ISIG  );	\
	C = __builtin_shuffle(C, ISIG2 );	\
	D = __builtin_shuffle(D, ISIG3 );	\
    }


#endif


# define ROUND							\
     { QROUND(A,B,C,D); TODIAG; QROUND(A,B,C,D); TOROW; }


# define XORA(i) (*msg)[i] ^= raaz_tole32( A[i]    )
# define XORB(i) (*msg)[i] ^= raaz_tole32( B[i-4]  )
# define XORC(i) (*msg)[i] ^= raaz_tole32( C[i-8]  )
# define XORD(i) (*msg)[i] ^= raaz_tole32( D[i-12] )


# define ChaChaConstantRow  ((Vec){ C0     , C1     , C2     ,  C3    })




# if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
#   define INP(i) (((Vec *)msg)[i])
#   define WR(i,R) { MSG  = INP(i); MSG ^= R; INP(i) = MSG; }
#   define WRITE { WR(0,A); WR(1,B); WR(2,C); WR(3,D); }
# else
#   define XORA(i) (*msg)[i] ^= raaz_tole32( A[i]    )
#   define XORB(i) (*msg)[i] ^= raaz_tole32( B[i-4]  )
#   define XORC(i) (*msg)[i] ^= raaz_tole32( C[i-8]  )
#   define XORD(i) (*msg)[i] ^= raaz_tole32( D[i-12] )
#   define WRITE                                        \
    {   XORA(0)  ; XORA(1)  ; XORA(2)  ; XORA(3);       \
        XORB(4)  ; XORB(5)  ; XORB(6)  ; XORB(7);       \
        XORC(8)  ; XORC(9)  ; XORC(10) ; XORC(11);      \
        XORD(12) ; XORD(13) ; XORD(14) ; XORD(15);      \
    }
#  endif /* Byte order */


/* One should ensure that msg is aligned to 16 bytes. */
static inline void chacha20vec128(Block *msg, int nblocks, const Key key, const IV iv, Counter *ctr)
{
    register Vec A , B, C, D;
    register Vec M1, M2, M3;
    register Vec MSG;

    /* TODO: Optimise with vector load (take care of alignments) */

    M1 =  (Vec){ key[0] , key[1] , key[2] , key[3] };
    M2 =  (Vec){ key[4] , key[5] , key[6] , key[7] };
    M3 =  (Vec){ *(ctr) , iv[0]  ,  iv[1] , iv[2]  };

    *ctr += nblocks;

    for(; nblocks > 0; -- nblocks, ++msg)
    {
	/* Initialise the state;
	   Except for the counter everything is the same
	 */

	A = ChaChaConstantRow;
	B = M1; C = M2; D = M3;

	ROUND; /* 0,1   */
	ROUND; /* 2,3   */
	ROUND; /* 4,5   */
	ROUND; /* 6,7   */
	ROUND; /* 8,9   */
	ROUND; /* 10,11 */
	ROUND; /* 12,13 */
	ROUND; /* 14,15 */
	ROUND; /* 16,17 */
	ROUND; /* 18,19 */

	A += ChaChaConstantRow;


	B += M1;
	C += M2;
	D += M3;

	/* TODO: Optimise with vector load (take care of
	 * alignments) */

	WRITE;

	++M3[0];         /* increment counter      */

    }
    return;
}

void raazChaCha20BlockVector(Block *msg, int nblocks, const Key key, const IV iv, Counter *ctr)
{
    chacha20vec128(msg, nblocks, key, iv, ctr);
}

{'fraction_non_alphanumeric': 0.1914345318443981, 'fraction_numerical': 0.06209350840593938, 'mean_word_length': 2.0185185185185186, 'pattern_counts': {'":': 0, '<': 7, '<?xml version=': 0, '>': 9, 'https://': 0, 'lorem ipsum': 0, 'www.': 0, 'xml': 0}, 'pii_count': 0, 'substrings_counts': 0, 'word_list_counts': {'cursed_substrings.json': 2, 'profanity_word_list.json': 0, 'sexual_word_list.json': 0, 'zh_pornsignals.json': 0}}
{'dir': 'git-commits-cleaned', 'id': '6796746', 'n_tokens_mistral': 4216, 'n_tokens_neox': 3837, 'n_words': 935}