Commit 5c587f9b authored by Akira Yokosawa's avatar Akira Yokosawa Committed by Paul E. McKenney
Browse files

tools/memory-model: Remove redundant initialization in litmus tests 



This is a revert of commit 1947bfcf ("tools/memory-model: Add types
to litmus tests") with conflict resolutions.

klitmus7 [1] is aware of default types of "int" and "int*".
It accepts litmus tests for herd7 without extra type info unless
non-"int" variables are referenced by an "exists", "locations",
or "filter" directive.

[1]: Tested with klitmus7 versions 7.49 or later.

Suggested-by: default avatarPaul E. McKenney <paulmck@kernel.org>
Signed-off-by: default avatarAkira Yokosawa <akiyks@gmail.com>
Signed-off-by: default avatarPaul E. McKenney <paulmck@kernel.org>
parent 8881e7a7

tools/memory-model/litmus-tests/CoRR+poonceonce+Once.litmus

+1 −3
Original line number Diff line number Diff line
@@ -7,9 +7,7 @@ C CoRR+poonceonce+Once 
 * reads from the same variable are ordered.

 *)



{

	int x;

}

{}



P0(int *x)

{

tools/memory-model/litmus-tests/CoRW+poonceonce+Once.litmus

+1 −3
Original line number Diff line number Diff line
@@ -7,9 +7,7 @@ C CoRW+poonceonce+Once 
 * a given variable and a later write to that same variable are ordered.

 *)



{

	int x;

}

{}



P0(int *x)

{

tools/memory-model/litmus-tests/CoWR+poonceonce+Once.litmus

+1 −3
Original line number Diff line number Diff line
@@ -7,9 +7,7 @@ C CoWR+poonceonce+Once 
 * given variable and a later read from that same variable are ordered.

 *)



{

	int x;

}

{}



P0(int *x)

{

tools/memory-model/litmus-tests/CoWW+poonceonce.litmus

+1 −3
Original line number Diff line number Diff line
@@ -7,9 +7,7 @@ C CoWW+poonceonce 
 * writes to the same variable are ordered.

 *)



{

	int x;

}

{}



P0(int *x)

{

tools/memory-model/litmus-tests/IRIW+fencembonceonces+OnceOnce.litmus

+1 −4
Original line number Diff line number Diff line
@@ -10,10 +10,7 @@ C IRIW+fencembonceonces+OnceOnce 
 * process?  This litmus test exercises LKMM's "propagation" rule.

 *)



{

	int x;

	int y;

}

{}



P0(int *x)

{